HomeIn-Portal Phabricator

Merge of "themes/advanced/releases/1.2.1-B2@15763" to…