commit #824