Merge branch 'bug/JAL-2673' into documentation/JAL-2675_release2102b1