Trying to resolve merge conflict on TRUNK-5115

12

@gracebish you may ignore the squashing of the commits as per resolution here RFC: Favour not squashing commits over squashing commits