Oliver's PR Merge remote-tracking branch 'upstream/next' into next
Oliver's PR
Merge remote-tracking branch 'upstream/next' into next

PalNilsson/pilot2,PalNilsson/pilot2,mlassnig/pilot2,mlassnig/pilot2