Implements #755