777: Merge stable trunk into 2018.3 - Maintainer Requested
Authored by: octal450 2019-05-12
Parent: [r3957]
Child: [r3959]