HomeIn-Portal Phabricator

Merge of "modules/custom/branches/1.2.x@16539" to "modules/custom/branches/1.3.