Merge branch 'feature/JAL-2587' into releases/Release_2_10_2b1_Branch