### Issue description Apply Change similar to https://github.com/grails/grails-core/pull/13387