Implements #894