merge from 1.6.1