Restored r786 (v1.4.0.10) for this feature branch as HEAD
Authored by: hermsen 2021-02-25
Parent: [r790]
Child: [r792]