Mashup of trunk v0906 and branch by Ian Campbel
Contains Rebirth code
=> v0907
Authored by: hermsen 2020-10-15
Parent: [r442]
Child: [r444]