Fixes regression introduced recently #3941
Merge remote-tracking branch 'origin/master'