minor changes
a plugin that can load
Merge changes from upstream.