[YLP] squash commits