Hung proto merge

Creating another merge to pull all the work back to upstream