Manually apply PR #2234
2 files changed