updated for 3.5.0 nightly builds