parser from upstream/master