Bug fix in parse
Merge branch 'common_dev' into naf