Merge branch 'groovy/JAL-2074_upgradeto2.4.4' into develop