Implements #920