Merge branch 'patch_JAL-1004' into develop