Is now synced with the trunk as I upmerged the trunk into this branch
Authored by: hermsen 2021-03-10
Parent: [r815]
Child: [r817]