Code quality issues
Merge branch 'Resharper'
Merge branch 'master' into Sats