Merge 4.0.4 into releases