Fix #4851
7 files changed