Intermediate cleaned up revision to merge into.
The previous revision gave too much hassle
Authored by: hermsen 2021-09-19
Parent: [r923]
Child: [r925]