Pull forward 1.3.x CHANGES