(MDEV-9407, MDEV-9408) from 10.1 Needed to fix MDEV-10317 easier.
Attach a file by drag & drop or click to upload
