new build with rolled in fixes 4.0.2