#33663

Fixes for #33663