[Bug] Fixing scrutinizer again. Why scrutinizer do you hate me so
Merge branch 'master' into develop