merge from 1033.1