JAL-2774 Fixed merge issues