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