Merge "Bug 2818: Updated implementation of parser."