merged [85302] from trunk