Merge v3-dev branch into master