Merge master updates in 3.3/develop

Quick update of 3.3/develop to merge changes from master branch.