Implements #908