Merge "enable packages" into v2.0