Closes #16116: Merged fix from 3.3.