merged [85208] from trunk
merged [85209] from trunk