Changes for GRAILS-7173