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