Merge branch 'documentation/JAL-3407_2.11.1_release' into develop