added modifications to existing pull request 717 TRUNK-3293