Fix: Missing special code
Merge remote-tracking branch 'origin/3.4' into 3.4_backported