Merge branch 'master' into pstools

The MR for this branch needs our CI pipeline to pass, but the commit was
made before we added any CI tests. I'm not sure how we ended up in that
state but the obvious resolution is to merge master into this branch so
the tests become available