Merge "enable package builds" into v2.0