Fix sync with 1.5 branch