Implements #1207