Upgrade 1171

Ready for merge.