Backport 11408 master


@LukasReschke FYI