GRAILS-11051