Implements #1328