commit #632