HomeIn-Portal Phabricator

Merge of "modules/custom/releases/1.2.1@16085" to "modules/custom/branches/1.3.