Trunk 1906

new pull request to point to TRUNK-1906 rather than master