util files and plugin_framework updates
merging with origin