Initial pre-3.0 merge