Fixing merge conflicts for this cherry pick
Fixing some of the packaging properties