Merge branch 'feature/JAL-2587' into documentation/JAL-2675_release2102b1