Bump to 4.0.4-1
Merge to 4.0.4-1