Merge remote-tracking branch 'origin/bug/JAL-2576' into bug/JAL-2591