Merge branch 'documentation/JAL-2675_release2102b1' into develop