Merge our fixes branch from the 4.18 cycle to resolve some minor conflicts.
Attach a file by drag & drop or click to upload
