Reintegrated the branch 2019-06-14_development into trunk
Authored by: j-lamm 2019-12-06
Parent: [r221]
Child: [r223]