Subset of Marco's changes
Compare changes
This mr is a subset of marcos changes in !10 (closed).
It contains the following portions:
It deliberately omits the following portions:
I've split out the latter three changes and will submit them in a second MR that can be discussed/reworked on its own.
Thus this mr thus fully superseeds !3 (closed), !4 (closed), !5 (closed) and !7 (closed), and partially addresses !10 (closed).
Reviews welcome.