Implements #717