Implements #1179