MP1-2441 : resolve merge conflict