GRAILS-10444