Merge branch 'JAL-1454_patch' into develop