HomePhorge

Merge master into host validation