Camera uplift

This is the pull request we'll use to uplift lots of camera changes from master to v1.4