Patch-5.0.4-ui-changes