Merge remote-tracking branch 'origin/bug/JAL-2515' into develop