Merge "Apply cutout offset when applicable" into main