Merge #4778

Merge #4778