Merge branch 'fix/scrubber-recompile-warnings-as-errors' into 'develop'