merge #818