Merge Ubuntu deltas

This merge request merges the Ubuntu deltas into the tree.

The commits have the original author information attached as a Co-Authored-By directive.