Implements #1114