+ Merge with patch from scrutinizer