Merge "Fix bug for user removed case"