Merge branch 'improvement/JAL-3783_upgrade_to_groovy-4' into develop