more possible GRAILS-7471 improvements