Implements #934