WIP - suggested edits for 2.2.0 release