Bring the 4.0 version up to date with the post deploy process from 3.10.