[scrutinizer] Ramdom fixes
Merge pull request #2274 from aRn0D/scrutinizer_fix

[scrutinizer] Ramdom fixes
Merge remote-tracking branch 'upstream/master'