Resync of the development branch with trunk
Authored by: j-lamm 2019-12-21
Parent: [r231]
Child: [r233]