Merge 3.0 develop branch into master