Pretty big patch and untested due to lack of hardware, so handle it with care :)
Attach a file by drag & drop or click to upload
