Code Review 2.1.1

Items in Flux
These are items that are changing rapidly, or that are expected to have further change for the next release. Updated images may need to be updated again before release.