Merge branch 'develop' into merge/JAL-3310_and_JAL-3300