merge from 1.7.1