Implements #719