Report changes from house branch to work

Report changes from house branch to work
Fix failed merge