Fix #5484
Merge last edits