update of personal branch with latest trunk part deux
Authored by: aliazzz 2020-06-01
Parent: [r163]
Child: [r165]