applied scrutenizer patches
Merge branch 'feature-scrutinizer' into development