3.0/develop fixes