777: merge stable trunk into 2018.3 release
Authored by: isaakd 2019-03-23
Parent: [r3850]
Child: [r3852]