SC-85 Fix some inspections issues
Merge branch 'production'
Change system resource version