commit #704