Merge package-support into master