merge of home (12/2016)