Added extensionapi:configure command
Fixed merge conflict