update of personal branch with various bugfixes/other changes
Authored by: aliazzz 2020-09-12
Parent: [r338]
Child: [r340]