Merge "Block align start and length while punching holes" into main