merged from 1033.2