commit #684