Implements #1255