resolved conflicts for merge of 49a24460 to master