manual merge of #125