This is manual cherry=pick of 9debeb6e, due to BT5 format change.
Attach a file by drag & drop or click to upload
