Merge branch 'patch/Clear_Highlight_JAL-3493' into releases/Release_2_11_1_Branch