Merge branch 'dev-master' into dev-3.x