Updated to 5.0 R2 branch