resolved conflicts for merge of 64893ccc to master