commit #766