MDEV-21201: Null-Merge 10.3

Sorry, this should have been pushed instead of
7f4c749 to 10.3.
(The push of d63631c
prevented required an extra merge of that fix.
And that commit was merged to 10.4
da78e95.)

Author: dr-m