Merge "Remove PunchHole.kt (1/2)" into main