Merge branch 'bug/JAL-2665-2.10.3' into portforward/JAL-2675_2102b1to2103