Implements #692