HomeIn-Portal Phabricator

Merge of "themes/advanced/branches/1.2.x@16083" to "themes/advanced/branches/1.