Update parser

Merged Alvin Noe Ladines requested to merge parser-fix into develop

Merge request reports