--HR-398 Leave screen changes for visually distinguish