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