commit #822