Patch for issue GROOVY-7043