merged [85225] from trunk
merged [85226] from trunk