Manual merge #783