Merge "Update Settings to match Framework"