merge #7063 from 1.2