reapply patch 96b472c0 It was not merged correctly into 10.5+
Attach a file by drag & drop or click to upload
