merge from 1.3.9