Merge urgent fixes so pending patches for 4.9 can be applied.
Attach a file by drag & drop or click to upload
