PR adjustments (squash)