Merge branch 'task/JAL-3047_clover2104b1_cherrypick' into releases/Release_2_10_4_Branch