Merge branch 'dev' into Release_3