Master => develop for 3.0.0 release cleanup