commit #717