Fixes # ## Target Release 1.12.x ## CHANGELOG entry - [ ] This change is user-facing and I added a changelog entry. - [ ] This change is not user-facing.