TRUNK-4144

Initial work done on TRUNK-4144