merge from 1.8