Fixes for GRAILS-10977
Merge pull request #450 from sbglasius/GRAILS-10977

Fixes for GRAILS-10977 (against 2.3.x)