Implements #1211