GROOVY-11299: prep work
6 files changed