Merge "Flag punch hole changes with build time flag" into main