Merge branch 'master' into house-management-service