Implements #704