Merge commit 'origin/bug_112_enable_extensions_manager' into experimental