Implements #710