Merge of "w/in-commerce/branches/5.2.x@16541" to "w/in-commerce/branches/5.3.x@16522". Conflicts:
02 Jul 17 Alex 16548
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.