Merge branch 'merge/JAL-3140' into develop