Implements #918