Implements #1152