Merge "Adding Manage External Sources Settings"