Manually merge changes for GRAILS-9644
Merge pull request #2 from longwa/GRAILS-9644

Manually merge changes for GRAILS-9644