Patch5.0.4-changes