Merge "Add Parser::resetOutput() and getStripState()"