Converted to preInit and Init hooks. This is to try to limit how much I touch the vanilla codebase.
Merge remote-tracking branch 'origin/featuredev'
Version Bump