Merge multi-host branch into master