Implements #1060