HomeIn-Portal Phabricator

Merge of "in-portal/branches/5.2.x@16544" to "in-portal/branches/5.3.x@16534".