Merged -r6847:6850 from eb/trial-merge into trunk. This changeset