BS-10726
Integrate new groovy definition