Implements #514