[HG] Fixing code for HomeCtrl and test for CI.