Close #4830, #3649
4 files changed