Merge "BUG-580: Improved parsing."