GRAILS-9997: Additional changes: don't add duplicate methods