Reintegrated the development branch 2020-01-23_development into trunk
Authored by: j-lamm 2020-08-03
Parent: [r265]
Child: [r267]