+ Merge with patch from scrutinizer
+ Remove verbose clover