Changed to reproduce GRAILS-11869