Canonical:default

Current build. Accepted by Amy Walker.

Ancestor build. There were unaccepted changes, so this was not used as a baseline.

Accepted by Sareh.

Accepted by Simon Sinclair.

Accepted by Jim Johnson-Rollings.

Accepted by Jonathan Roebuck.