Merge branch 'features/JAL-2549_updateJABAWSto220' into releases/Release_2_10_2b1_Branch