Fix #4917
3 files changed