Updating camera-scale branch to have latest changes.