Merge our fixes branch to bring in some changes that are prerequisites for work in next.
Attach a file by drag & drop or click to upload
