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