GRAILS-11530 add test
GRAILS-11517 add test
Merge branch '2.3.x' into 2.4.x