Merge branch 'bug/JAL-2778again' into releases/Release_2_10_4_Branch