Follow up on #16408

[skip ci]
Merge branch 'jonatack-patch-8'