Update 2.7
Revert "Update 2.7"

This reverts commit 5f09fc9597be2a7fa23b7f05e16d95b2ec14e15e.
Move to plugin
Update submods too
Merge 2.7 updates