Merge #772
Merge #763