merge upstream, parser fixes