HomeIn-Portal Phabricator

fixes in RC related to incorrect merge