A couple of topic PRs in case anyone is around on ...
# request-review
s