commit #612