commit #769