WIP: master to release-4.0
Merge master to release-4.0 using merge strategy ours, to shrink the delta between both branches.
Edited by georg
Merge master to release-4.0 using merge strategy ours, to shrink the delta between both branches.