merge from 1.5.2