update before new merge of trunk into this lib
Authored by: aliazzz 2020-06-13
Parent: [r178]
Child: [r180]