Merge branch 'commit-to-packagehome'