GROOVY-6268: Specially for Cédric :)