auto merge from git
added DCP checking to parser. noninformative error message