Merge branch 'dev'
small case improvments