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