Merge remote-tracking branch 'origin/development' into development
Merge remote-tracking branch 'origin/development' into development
Merge remote-tracking branch 'origin/development' into development
* Cleanup module and bootstrapper
* Move template name filter init to bootstrapper and disable for console requests