Merge branch 'bug/JAL-2691_nomultimermapping' into documentation/JAL-2675_release2102b1