Apply relevant parts of two patches in mainline tree: 42431acb 7d12e780
Attach a file by drag & drop or click to upload
