Merge branch 'dev'
Merge branch 'dev' into feature/clext