2.5 => 3.0 merge