Implements #896