Merge multihost mode to 2013.1.2