Apply scrutinizer patch with a few modifications
Add scrutinizer support