Port pull #702 to 2.2