Merge of "in-portal/branches/5.2.x@16513" to "in-portal/branches/5.3.x@16503". Conflicts:
20 Jan 17 Alex 16519
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.