Merge branch 'devel/home/master'