Merge "Correct REMOVE_USER change mode." into main