Implements #1035