Roll-up of Category 1 config changes and other edits