Merge remote branch 'origin/bug_112_enable_extensions_manager'