Implemented GRAILS-10760
Merge branch '2.3.x'