further changes according to comments in the previous pull request TRUNK-4314
Merge pull request #924 from harsha89/TRUNK-4314-additional

further changes according to comments in the previous pull request TRUNK--4314