Partial CR #296