Merge "Ugly fix for horizon_identity_host param"