modified during merge of master into feature branch