Manual Merge #967

Manually merge #967