fix and revert 214e5f4
fix
Merge core-parser/master