Merge "Fix horizon identity host setting"