- removed everything except changes related to: GRAILS-8963