1st cut for supporting grails 2.4.2