Merge branch 'develop' into doc/JAL-3746_Release_2_11_2