Implementing recent changes to 3.0 branch