commit #820