Bump to 4.0.4a
Merge to 4.0.4a