merged user related changes