Merge branch 'dev', remote branch 'harenome/dev' into dev