Implements #1105