Improvement for GRAILS-9912 fix
Merge branch '2.0.x' into 2.1.x