Changes in common
Merge branch 'master' into parser