Merge
Revert "Revert some intelli-plug changes"

This reverts commit d47548261cda47205356e5e60dbe5153e1b29ce7.