[ci skip] Add remaining changes from PR #3826
2 files changed