Fix: Missing commit
Merge remote-tracking branch 'origin/3.5' into 3.5_backported