resolved conflicts for merge of cfccf5a1 to master