WIP Scrutinizer fixes
Merge branch 'develop'

* develop:
  WIP Scrutinizer fixes