#482 for 3.7 branch

#482 for 3.7 branch