Latest round of changes from SF for review

See Elango's notes in the PR for what's changed.