Misc: this is also core plugin, not module
Merge pull request #962 from Mikaela/misc

Misc: this is also core plugin, not module