Merge remote-tracking branch 'origin/bug/JAL-2742' into feature/JAL-2674take2