Merge for 7.0.4.rc.0