Merged branch 'configured-extensions'