merge of #372 to develop