merged [85497] from trunk