Merge branch 'bug/JAL-2899' into releases/Release_2_10_4_Branch