commit #609