Merge from igor-borisov and mtaivai