merge from scrutinizer