Merge branch 'features/JAL-2549_updateJABAWSto220' into develop