Moving v3.0.0 updates to TRUNK branch