In a rebase of the merge, two preceding commits were accidentally reverted:
commit 112b2396 (MDEV-26308)
commit ac2857a5 (MDEV-25717)

Thanks to Daniele Sciascia for noticing this.