Merge branch 'merge/develop_JAL-1780_JAL-653_JAL-1892' into develop