Merge of "w/in-commerce/branches/5.2.x@16489" to "w/in-commerce/branches/5.3.x@16430".
Merge of "w/in-commerce/releases/5.2.2-B1@16493" to "w/in-commerce/branches/5.3.x@16430".
Conflicts:
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.