Merge packaging updates from the v4.1 branch