Restored the v4.0 post build