Implements #884