Bug fix
Merge branch 'common_dev' into naf