merged from #271