The first three patches from !39

Merged Arlo Breault requested to merge three into main

To review independently

Merge request reports