Merge "view changes for py3" into feature/zuulv3