Uplift to 4.0.4.