Merge "Add dump support to the settings provider"