TRUNK-4389 Fixed merge conflict