commit #496