Merge branch 'dev' (south release)