GRAILS-10077 fix
Merge branch '2.2.x'