Tweaks to the plugin disable guide.
Guide tweaks.
Merge origin/master