merged rev. 84642-85778
merged rev. 85821