Merge "Apply flag RELEASE_PACKAGE_BETTER_BUG" into main