merge of some changes ferenda/master