Refs #21 Parser extension merge fix