sync w/ 1.3.2 release