commit #812