commit #825