Merge branch 'merge/develop_JAL-1260' into develop