Updates for 3.0.4-rc3 build on 2.11.0-RC4