merged from upstream/master