Implements #1225