Merged in homehost-protection patch