merged [85175] from trunk