Canonical:default

Current build. Accepted by Chris Hinds.

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

Accepted by Gerald Pharin.

Accepted by RichardPK.

Accepted by Simon Sinclair.

Auto-accepted