Modify cparser not to enter the infinite loop.
Merge branch 'dev'