Merge branch 'bugs/JAL-2922' into releases/Release_2_10_4_Branch