local updates
merge GRAILSPLUGIN enhancements in