More packaging updates from the master branch