@lansweeper/data-platform-outbound-grpc 0.3.4 → 0.3.5

package/model/target/generated-sources/protobuf/java/com/lansweeper/dp/outbound/v1/ActiveDirectoryUser.java

@@ -25,6 +25,7 @@ private static final long serialVersionUID = 0L;
     samAccountName_ = "";
     cn_ = "";
     ou_ = "";
+    domain_ = "";
     description_ = "";
     comment_ = "";
     company_ = "";
@@ -257,6 +258,53 @@ private static final long serialVersionUID = 0L;
     }
   }
 
+  public static final int DOMAIN_FIELD_NUMBER = 58;
+  @SuppressWarnings("serial")
+  private volatile java.lang.Object domain_ = "";
+  /**
+   * <code>optional string domain = 58;</code>
+   * @return Whether the domain field is set.
+   */
+  @java.lang.Override
+  public boolean hasDomain() {
+    return ((bitField0_ & 0x00000010) != 0);
+  }
+  /**
+   * <code>optional string domain = 58;</code>
+   * @return The domain.
+   */
+  @java.lang.Override
+  public java.lang.String getDomain() {
+    java.lang.Object ref = domain_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      domain_ = s;
+      return s;
+    }
+  }
+  /**
+   * <code>optional string domain = 58;</code>
+   * @return The bytes for domain.
+   */
+  @java.lang.Override
+  public com.google.protobuf.ByteString
+      getDomainBytes() {
+    java.lang.Object ref = domain_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      domain_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
   public static final int DESCRIPTION_FIELD_NUMBER = 5;
   @SuppressWarnings("serial")
   private volatile java.lang.Object description_ = "";
@@ -266,7 +314,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasDescription() {
-    return ((bitField0_ & 0x00000010) != 0);
+    return ((bitField0_ & 0x00000020) != 0);
   }
   /**
    * <code>optional string description = 5;</code>
@@ -313,7 +361,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasComment() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return ((bitField0_ & 0x00000040) != 0);
   }
   /**
    * <code>optional string comment = 6;</code>
@@ -360,7 +408,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasCompany() {
-    return ((bitField0_ & 0x00000040) != 0);
+    return ((bitField0_ & 0x00000080) != 0);
   }
   /**
    * <code>optional string company = 7;</code>
@@ -406,7 +454,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPrimaryGroupId() {
-    return ((bitField0_ & 0x00000080) != 0);
+    return ((bitField0_ & 0x00000100) != 0);
   }
   /**
    * <code>optional int32 primary_group_id = 8;</code>
@@ -425,7 +473,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasEnabled() {
-    return ((bitField0_ & 0x00000100) != 0);
+    return ((bitField0_ & 0x00000200) != 0);
   }
   /**
    * <code>optional bool enabled = 9;</code>
@@ -444,7 +492,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasUserAccountControl() {
-    return ((bitField0_ & 0x00000200) != 0);
+    return ((bitField0_ & 0x00000400) != 0);
   }
   /**
    * <code>optional int32 user_account_control = 10;</code>
@@ -463,7 +511,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasAccountExpires() {
-    return ((bitField0_ & 0x00000400) != 0);
+    return ((bitField0_ & 0x00000800) != 0);
   }
   /**
    * <code>optional .google.protobuf.Timestamp account_expires = 11;</code>
@@ -489,7 +537,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasLockoutTime() {
-    return ((bitField0_ & 0x00000800) != 0);
+    return ((bitField0_ & 0x00001000) != 0);
   }
   /**
    * <code>optional .google.protobuf.Timestamp lockout_time = 12;</code>
@@ -515,7 +563,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPasswordLastSet() {
-    return ((bitField0_ & 0x00001000) != 0);
+    return ((bitField0_ & 0x00002000) != 0);
   }
   /**
    * <code>optional .google.protobuf.Timestamp password_last_set = 13;</code>
@@ -541,7 +589,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasLastLogon() {
-    return ((bitField0_ & 0x00002000) != 0);
+    return ((bitField0_ & 0x00004000) != 0);
   }
   /**
    * <code>optional .google.protobuf.Timestamp last_logon = 14;</code>
@@ -567,7 +615,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasLockoutDate() {
-    return ((bitField0_ & 0x00004000) != 0);
+    return ((bitField0_ & 0x00008000) != 0);
   }
   /**
    * <code>optional .google.protobuf.Timestamp lockout_date = 15;</code>
@@ -593,7 +641,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasCanUserChangePassword() {
-    return ((bitField0_ & 0x00008000) != 0);
+    return ((bitField0_ & 0x00010000) != 0);
   }
   /**
    * <code>optional bool can_user_change_password = 16;</code>
@@ -612,7 +660,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPasswordExpirationDate() {
-    return ((bitField0_ & 0x00010000) != 0);
+    return ((bitField0_ & 0x00020000) != 0);
   }
   /**
    * <code>optional .google.protobuf.Timestamp password_expiration_date = 17;</code>
@@ -638,7 +686,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPasswordNeverExpires() {
-    return ((bitField0_ & 0x00020000) != 0);
+    return ((bitField0_ & 0x00040000) != 0);
   }
   /**
    * <code>optional bool password_never_expires = 18;</code>
@@ -657,7 +705,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPasswordRequired() {
-    return ((bitField0_ & 0x00040000) != 0);
+    return ((bitField0_ & 0x00080000) != 0);
   }
   /**
    * <code>optional bool password_required = 19;</code>
@@ -676,7 +724,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPasswordChangeableDate() {
-    return ((bitField0_ & 0x00080000) != 0);
+    return ((bitField0_ & 0x00100000) != 0);
   }
   /**
    * <code>optional .google.protobuf.Timestamp password_changeable_date = 20;</code>
@@ -703,7 +751,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasEmail() {
-    return ((bitField0_ & 0x00100000) != 0);
+    return ((bitField0_ & 0x00200000) != 0);
   }
   /**
    * <code>optional string email = 21;</code>
@@ -750,7 +798,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasDisplayName() {
-    return ((bitField0_ & 0x00200000) != 0);
+    return ((bitField0_ & 0x00400000) != 0);
   }
   /**
    * <code>optional string display_name = 22;</code>
@@ -797,7 +845,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasGivenName() {
-    return ((bitField0_ & 0x00400000) != 0);
+    return ((bitField0_ & 0x00800000) != 0);
   }
   /**
    * <code>optional string given_name = 23;</code>
@@ -844,7 +892,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasSurname() {
-    return ((bitField0_ & 0x00800000) != 0);
+    return ((bitField0_ & 0x01000000) != 0);
   }
   /**
    * <code>optional string surname = 24;</code>
@@ -891,7 +939,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasTelephone() {
-    return ((bitField0_ & 0x01000000) != 0);
+    return ((bitField0_ & 0x02000000) != 0);
   }
   /**
    * <code>optional string telephone = 25;</code>
@@ -938,7 +986,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasFacSimile() {
-    return ((bitField0_ & 0x02000000) != 0);
+    return ((bitField0_ & 0x04000000) != 0);
   }
   /**
    * <code>optional string fac_simile = 26;</code>
@@ -985,7 +1033,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasMobile() {
-    return ((bitField0_ & 0x04000000) != 0);
+    return ((bitField0_ & 0x08000000) != 0);
   }
   /**
    * <code>optional string mobile = 27;</code>
@@ -1032,7 +1080,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasStreetAddress() {
-    return ((bitField0_ & 0x08000000) != 0);
+    return ((bitField0_ & 0x10000000) != 0);
   }
   /**
    * <code>optional string street_address = 28;</code>
@@ -1079,7 +1127,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasCity() {
-    return ((bitField0_ & 0x10000000) != 0);
+    return ((bitField0_ & 0x20000000) != 0);
   }
   /**
    * <code>optional string city = 29;</code>
@@ -1126,7 +1174,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasCountry() {
-    return ((bitField0_ & 0x20000000) != 0);
+    return ((bitField0_ & 0x40000000) != 0);
   }
   /**
    * <code>optional string country = 30;</code>
@@ -1173,7 +1221,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasDepartment() {
-    return ((bitField0_ & 0x40000000) != 0);
+    return ((bitField0_ & 0x80000000) != 0);
   }
   /**
    * <code>optional string department = 31;</code>
@@ -1220,7 +1268,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasDeliveryOfficeName() {
-    return ((bitField0_ & 0x80000000) != 0);
+    return ((bitField1_ & 0x00000001) != 0);
   }
   /**
    * <code>optional string delivery_office_name = 32;</code>
@@ -1267,7 +1315,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasCountryAbbreviation() {
-    return ((bitField1_ & 0x00000001) != 0);
+    return ((bitField1_ & 0x00000002) != 0);
   }
   /**
    * <code>optional string country_abbreviation = 33;</code>
@@ -1314,7 +1362,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPostalCode() {
-    return ((bitField1_ & 0x00000002) != 0);
+    return ((bitField1_ & 0x00000004) != 0);
   }
   /**
    * <code>optional string postal_code = 34;</code>
@@ -1361,7 +1409,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasCountryCode() {
-    return ((bitField1_ & 0x00000004) != 0);
+    return ((bitField1_ & 0x00000008) != 0);
   }
   /**
    * <code>optional string country_code = 35;</code>
@@ -1408,7 +1456,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPrincipalName() {
-    return ((bitField1_ & 0x00000008) != 0);
+    return ((bitField1_ & 0x00000010) != 0);
   }
   /**
    * <code>optional string principal_name = 36;</code>
@@ -1455,7 +1503,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasTitle() {
-    return ((bitField1_ & 0x00000010) != 0);
+    return ((bitField1_ & 0x00000020) != 0);
   }
   /**
    * <code>optional string title = 37;</code>
@@ -1502,7 +1550,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasDivision() {
-    return ((bitField1_ & 0x00000020) != 0);
+    return ((bitField1_ & 0x00000040) != 0);
   }
   /**
    * <code>optional string division = 38;</code>
@@ -1549,7 +1597,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasInfo() {
-    return ((bitField1_ & 0x00000040) != 0);
+    return ((bitField1_ & 0x00000080) != 0);
   }
   /**
    * <code>optional string info = 39;</code>
@@ -1596,7 +1644,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasHomePhone() {
-    return ((bitField1_ & 0x00000080) != 0);
+    return ((bitField1_ & 0x00000100) != 0);
   }
   /**
    * <code>optional string home_phone = 40;</code>
@@ -1643,7 +1691,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPager() {
-    return ((bitField1_ & 0x00000100) != 0);
+    return ((bitField1_ & 0x00000200) != 0);
   }
   /**
    * <code>optional string pager = 41;</code>
@@ -1690,7 +1738,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasIpPhone() {
-    return ((bitField1_ & 0x00000200) != 0);
+    return ((bitField1_ & 0x00000400) != 0);
   }
   /**
    * <code>optional string ip_phone = 42;</code>
@@ -1737,7 +1785,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasHomePage() {
-    return ((bitField1_ & 0x00000400) != 0);
+    return ((bitField1_ & 0x00000800) != 0);
   }
   /**
    * <code>optional string home_page = 43;</code>
@@ -1784,7 +1832,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPostOfficeBox() {
-    return ((bitField1_ & 0x00000800) != 0);
+    return ((bitField1_ & 0x00001000) != 0);
   }
   /**
    * <code>optional string post_office_box = 44;</code>
@@ -1831,7 +1879,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasState() {
-    return ((bitField1_ & 0x00001000) != 0);
+    return ((bitField1_ & 0x00002000) != 0);
   }
   /**
    * <code>optional string state = 45;</code>
@@ -1878,7 +1926,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasProfilePath() {
-    return ((bitField1_ & 0x00002000) != 0);
+    return ((bitField1_ & 0x00004000) != 0);
   }
   /**
    * <code>optional string profile_path = 46;</code>
@@ -1925,7 +1973,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasScriptPath() {
-    return ((bitField1_ & 0x00004000) != 0);
+    return ((bitField1_ & 0x00008000) != 0);
   }
   /**
    * <code>optional string script_path = 47;</code>
@@ -1972,7 +2020,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasHomeDirectory() {
-    return ((bitField1_ & 0x00008000) != 0);
+    return ((bitField1_ & 0x00010000) != 0);
   }
   /**
    * <code>optional string home_directory = 48;</code>
@@ -2018,7 +2066,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasThumbnailPhoto() {
-    return ((bitField1_ & 0x00010000) != 0);
+    return ((bitField1_ & 0x00020000) != 0);
   }
   /**
    * <code>optional bytes thumbnail_photo = 49;</code>
@@ -2038,7 +2086,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasEmployeeId() {
-    return ((bitField1_ & 0x00020000) != 0);
+    return ((bitField1_ & 0x00040000) != 0);
   }
   /**
    * <code>optional string employee_id = 50;</code>
@@ -2085,7 +2133,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasEmployeeNumber() {
-    return ((bitField1_ & 0x00040000) != 0);
+    return ((bitField1_ & 0x00080000) != 0);
   }
   /**
    * <code>optional string employee_number = 51;</code>
@@ -2132,7 +2180,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasEmployeeType() {
-    return ((bitField1_ & 0x00080000) != 0);
+    return ((bitField1_ & 0x00100000) != 0);
   }
   /**
    * <code>optional string employee_type = 52;</code>
@@ -2179,7 +2227,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasInitials() {
-    return ((bitField1_ & 0x00100000) != 0);
+    return ((bitField1_ & 0x00200000) != 0);
   }
   /**
    * <code>optional string initials = 53;</code>
@@ -2226,7 +2274,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasMiddleName() {
-    return ((bitField1_ & 0x00200000) != 0);
+    return ((bitField1_ & 0x00400000) != 0);
   }
   /**
    * <code>optional string middle_name = 54;</code>
@@ -2273,7 +2321,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPrimaryGroupOid() {
-    return ((bitField1_ & 0x00400000) != 0);
+    return ((bitField1_ & 0x00800000) != 0);
   }
   /**
    * <code>optional string primary_group_oid = 55;</code>
@@ -2320,7 +2368,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasManagerOid() {
-    return ((bitField1_ & 0x00800000) != 0);
+    return ((bitField1_ & 0x01000000) != 0);
   }
   /**
    * <code>optional string manager_oid = 56;</code>
@@ -2421,165 +2469,168 @@ private static final long serialVersionUID = 0L;
     if (((bitField0_ & 0x00000008) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, ou_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, description_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000040) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 6, comment_);
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (((bitField0_ & 0x00000080) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, company_);
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (((bitField0_ & 0x00000100) != 0)) {
       output.writeInt32(8, primaryGroupId_);
     }
-    if (((bitField0_ & 0x00000100) != 0)) {
+    if (((bitField0_ & 0x00000200) != 0)) {
       output.writeBool(9, enabled_);
     }
-    if (((bitField0_ & 0x00000200) != 0)) {
+    if (((bitField0_ & 0x00000400) != 0)) {
       output.writeInt32(10, userAccountControl_);
     }
-    if (((bitField0_ & 0x00000400) != 0)) {
+    if (((bitField0_ & 0x00000800) != 0)) {
       output.writeMessage(11, getAccountExpires());
     }
-    if (((bitField0_ & 0x00000800) != 0)) {
+    if (((bitField0_ & 0x00001000) != 0)) {
       output.writeMessage(12, getLockoutTime());
     }
-    if (((bitField0_ & 0x00001000) != 0)) {
+    if (((bitField0_ & 0x00002000) != 0)) {
       output.writeMessage(13, getPasswordLastSet());
     }
-    if (((bitField0_ & 0x00002000) != 0)) {
+    if (((bitField0_ & 0x00004000) != 0)) {
       output.writeMessage(14, getLastLogon());
     }
-    if (((bitField0_ & 0x00004000) != 0)) {
+    if (((bitField0_ & 0x00008000) != 0)) {
       output.writeMessage(15, getLockoutDate());
     }
-    if (((bitField0_ & 0x00008000) != 0)) {
+    if (((bitField0_ & 0x00010000) != 0)) {
       output.writeBool(16, canUserChangePassword_);
     }
-    if (((bitField0_ & 0x00010000) != 0)) {
+    if (((bitField0_ & 0x00020000) != 0)) {
       output.writeMessage(17, getPasswordExpirationDate());
     }
-    if (((bitField0_ & 0x00020000) != 0)) {
+    if (((bitField0_ & 0x00040000) != 0)) {
       output.writeBool(18, passwordNeverExpires_);
     }
-    if (((bitField0_ & 0x00040000) != 0)) {
+    if (((bitField0_ & 0x00080000) != 0)) {
       output.writeBool(19, passwordRequired_);
     }
-    if (((bitField0_ & 0x00080000) != 0)) {
+    if (((bitField0_ & 0x00100000) != 0)) {
       output.writeMessage(20, getPasswordChangeableDate());
     }
-    if (((bitField0_ & 0x00100000) != 0)) {
+    if (((bitField0_ & 0x00200000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 21, email_);
     }
-    if (((bitField0_ & 0x00200000) != 0)) {
+    if (((bitField0_ & 0x00400000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 22, displayName_);
     }
-    if (((bitField0_ & 0x00400000) != 0)) {
+    if (((bitField0_ & 0x00800000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 23, givenName_);
     }
-    if (((bitField0_ & 0x00800000) != 0)) {
+    if (((bitField0_ & 0x01000000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 24, surname_);
     }
-    if (((bitField0_ & 0x01000000) != 0)) {
+    if (((bitField0_ & 0x02000000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 25, telephone_);
     }
-    if (((bitField0_ & 0x02000000) != 0)) {
+    if (((bitField0_ & 0x04000000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 26, facSimile_);
     }
-    if (((bitField0_ & 0x04000000) != 0)) {
+    if (((bitField0_ & 0x08000000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 27, mobile_);
     }
-    if (((bitField0_ & 0x08000000) != 0)) {
+    if (((bitField0_ & 0x10000000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 28, streetAddress_);
     }
-    if (((bitField0_ & 0x10000000) != 0)) {
+    if (((bitField0_ & 0x20000000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 29, city_);
     }
-    if (((bitField0_ & 0x20000000) != 0)) {
+    if (((bitField0_ & 0x40000000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 30, country_);
     }
-    if (((bitField0_ & 0x40000000) != 0)) {
+    if (((bitField0_ & 0x80000000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 31, department_);
     }
-    if (((bitField0_ & 0x80000000) != 0)) {
+    if (((bitField1_ & 0x00000001) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 32, deliveryOfficeName_);
     }
-    if (((bitField1_ & 0x00000001) != 0)) {
+    if (((bitField1_ & 0x00000002) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 33, countryAbbreviation_);
     }
-    if (((bitField1_ & 0x00000002) != 0)) {
+    if (((bitField1_ & 0x00000004) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 34, postalCode_);
     }
-    if (((bitField1_ & 0x00000004) != 0)) {
+    if (((bitField1_ & 0x00000008) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 35, countryCode_);
     }
-    if (((bitField1_ & 0x00000008) != 0)) {
+    if (((bitField1_ & 0x00000010) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 36, principalName_);
     }
-    if (((bitField1_ & 0x00000010) != 0)) {
+    if (((bitField1_ & 0x00000020) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 37, title_);
     }
-    if (((bitField1_ & 0x00000020) != 0)) {
+    if (((bitField1_ & 0x00000040) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 38, division_);
     }
-    if (((bitField1_ & 0x00000040) != 0)) {
+    if (((bitField1_ & 0x00000080) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 39, info_);
     }
-    if (((bitField1_ & 0x00000080) != 0)) {
+    if (((bitField1_ & 0x00000100) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 40, homePhone_);
     }
-    if (((bitField1_ & 0x00000100) != 0)) {
+    if (((bitField1_ & 0x00000200) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 41, pager_);
     }
-    if (((bitField1_ & 0x00000200) != 0)) {
+    if (((bitField1_ & 0x00000400) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 42, ipPhone_);
     }
-    if (((bitField1_ & 0x00000400) != 0)) {
+    if (((bitField1_ & 0x00000800) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 43, homePage_);
     }
-    if (((bitField1_ & 0x00000800) != 0)) {
+    if (((bitField1_ & 0x00001000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 44, postOfficeBox_);
     }
-    if (((bitField1_ & 0x00001000) != 0)) {
+    if (((bitField1_ & 0x00002000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 45, state_);
     }
-    if (((bitField1_ & 0x00002000) != 0)) {
+    if (((bitField1_ & 0x00004000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 46, profilePath_);
     }
-    if (((bitField1_ & 0x00004000) != 0)) {
+    if (((bitField1_ & 0x00008000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 47, scriptPath_);
     }
-    if (((bitField1_ & 0x00008000) != 0)) {
+    if (((bitField1_ & 0x00010000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 48, homeDirectory_);
     }
-    if (((bitField1_ & 0x00010000) != 0)) {
+    if (((bitField1_ & 0x00020000) != 0)) {
       output.writeBytes(49, thumbnailPhoto_);
     }
-    if (((bitField1_ & 0x00020000) != 0)) {
+    if (((bitField1_ & 0x00040000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 50, employeeId_);
     }
-    if (((bitField1_ & 0x00040000) != 0)) {
+    if (((bitField1_ & 0x00080000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 51, employeeNumber_);
     }
-    if (((bitField1_ & 0x00080000) != 0)) {
+    if (((bitField1_ & 0x00100000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 52, employeeType_);
     }
-    if (((bitField1_ & 0x00100000) != 0)) {
+    if (((bitField1_ & 0x00200000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 53, initials_);
     }
-    if (((bitField1_ & 0x00200000) != 0)) {
+    if (((bitField1_ & 0x00400000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 54, middleName_);
     }
-    if (((bitField1_ & 0x00400000) != 0)) {
+    if (((bitField1_ & 0x00800000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 55, primaryGroupOid_);
     }
-    if (((bitField1_ & 0x00800000) != 0)) {
+    if (((bitField1_ & 0x01000000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 56, managerOid_);
     }
     for (int i = 0; i < memberOfOid_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 57, memberOfOid_.getRaw(i));
     }
+    if (((bitField0_ & 0x00000010) != 0)) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 58, domain_);
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -2602,174 +2653,174 @@ private static final long serialVersionUID = 0L;
     if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, ou_);
     }
-    if (((bitField0_ & 0x00000010) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, description_);
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000040) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, comment_);
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (((bitField0_ & 0x00000080) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, company_);
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (((bitField0_ & 0x00000100) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(8, primaryGroupId_);
     }
-    if (((bitField0_ & 0x00000100) != 0)) {
+    if (((bitField0_ & 0x00000200) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(9, enabled_);
     }
-    if (((bitField0_ & 0x00000200) != 0)) {
+    if (((bitField0_ & 0x00000400) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(10, userAccountControl_);
     }
-    if (((bitField0_ & 0x00000400) != 0)) {
+    if (((bitField0_ & 0x00000800) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(11, getAccountExpires());
     }
-    if (((bitField0_ & 0x00000800) != 0)) {
+    if (((bitField0_ & 0x00001000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(12, getLockoutTime());
     }
-    if (((bitField0_ & 0x00001000) != 0)) {
+    if (((bitField0_ & 0x00002000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(13, getPasswordLastSet());
     }
-    if (((bitField0_ & 0x00002000) != 0)) {
+    if (((bitField0_ & 0x00004000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(14, getLastLogon());
     }
-    if (((bitField0_ & 0x00004000) != 0)) {
+    if (((bitField0_ & 0x00008000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(15, getLockoutDate());
     }
-    if (((bitField0_ & 0x00008000) != 0)) {
+    if (((bitField0_ & 0x00010000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(16, canUserChangePassword_);
     }
-    if (((bitField0_ & 0x00010000) != 0)) {
+    if (((bitField0_ & 0x00020000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(17, getPasswordExpirationDate());
     }
-    if (((bitField0_ & 0x00020000) != 0)) {
+    if (((bitField0_ & 0x00040000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(18, passwordNeverExpires_);
     }
-    if (((bitField0_ & 0x00040000) != 0)) {
+    if (((bitField0_ & 0x00080000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(19, passwordRequired_);
     }
-    if (((bitField0_ & 0x00080000) != 0)) {
+    if (((bitField0_ & 0x00100000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(20, getPasswordChangeableDate());
     }
-    if (((bitField0_ & 0x00100000) != 0)) {
+    if (((bitField0_ & 0x00200000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(21, email_);
     }
-    if (((bitField0_ & 0x00200000) != 0)) {
+    if (((bitField0_ & 0x00400000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(22, displayName_);
     }
-    if (((bitField0_ & 0x00400000) != 0)) {
+    if (((bitField0_ & 0x00800000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(23, givenName_);
     }
-    if (((bitField0_ & 0x00800000) != 0)) {
+    if (((bitField0_ & 0x01000000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(24, surname_);
     }
-    if (((bitField0_ & 0x01000000) != 0)) {
+    if (((bitField0_ & 0x02000000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(25, telephone_);
     }
-    if (((bitField0_ & 0x02000000) != 0)) {
+    if (((bitField0_ & 0x04000000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(26, facSimile_);
     }
-    if (((bitField0_ & 0x04000000) != 0)) {
+    if (((bitField0_ & 0x08000000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(27, mobile_);
     }
-    if (((bitField0_ & 0x08000000) != 0)) {
+    if (((bitField0_ & 0x10000000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(28, streetAddress_);
     }
-    if (((bitField0_ & 0x10000000) != 0)) {
+    if (((bitField0_ & 0x20000000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(29, city_);
     }
-    if (((bitField0_ & 0x20000000) != 0)) {
+    if (((bitField0_ & 0x40000000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(30, country_);
     }
-    if (((bitField0_ & 0x40000000) != 0)) {
+    if (((bitField0_ & 0x80000000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(31, department_);
     }
-    if (((bitField0_ & 0x80000000) != 0)) {
+    if (((bitField1_ & 0x00000001) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(32, deliveryOfficeName_);
     }
-    if (((bitField1_ & 0x00000001) != 0)) {
+    if (((bitField1_ & 0x00000002) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(33, countryAbbreviation_);
     }
-    if (((bitField1_ & 0x00000002) != 0)) {
+    if (((bitField1_ & 0x00000004) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(34, postalCode_);
     }
-    if (((bitField1_ & 0x00000004) != 0)) {
+    if (((bitField1_ & 0x00000008) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(35, countryCode_);
     }
-    if (((bitField1_ & 0x00000008) != 0)) {
+    if (((bitField1_ & 0x00000010) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(36, principalName_);
     }
-    if (((bitField1_ & 0x00000010) != 0)) {
+    if (((bitField1_ & 0x00000020) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(37, title_);
     }
-    if (((bitField1_ & 0x00000020) != 0)) {
+    if (((bitField1_ & 0x00000040) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(38, division_);
     }
-    if (((bitField1_ & 0x00000040) != 0)) {
+    if (((bitField1_ & 0x00000080) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(39, info_);
     }
-    if (((bitField1_ & 0x00000080) != 0)) {
+    if (((bitField1_ & 0x00000100) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(40, homePhone_);
     }
-    if (((bitField1_ & 0x00000100) != 0)) {
+    if (((bitField1_ & 0x00000200) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(41, pager_);
     }
-    if (((bitField1_ & 0x00000200) != 0)) {
+    if (((bitField1_ & 0x00000400) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(42, ipPhone_);
     }
-    if (((bitField1_ & 0x00000400) != 0)) {
+    if (((bitField1_ & 0x00000800) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(43, homePage_);
     }
-    if (((bitField1_ & 0x00000800) != 0)) {
+    if (((bitField1_ & 0x00001000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(44, postOfficeBox_);
     }
-    if (((bitField1_ & 0x00001000) != 0)) {
+    if (((bitField1_ & 0x00002000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(45, state_);
     }
-    if (((bitField1_ & 0x00002000) != 0)) {
+    if (((bitField1_ & 0x00004000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(46, profilePath_);
     }
-    if (((bitField1_ & 0x00004000) != 0)) {
+    if (((bitField1_ & 0x00008000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(47, scriptPath_);
     }
-    if (((bitField1_ & 0x00008000) != 0)) {
+    if (((bitField1_ & 0x00010000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(48, homeDirectory_);
     }
-    if (((bitField1_ & 0x00010000) != 0)) {
+    if (((bitField1_ & 0x00020000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBytesSize(49, thumbnailPhoto_);
     }
-    if (((bitField1_ & 0x00020000) != 0)) {
+    if (((bitField1_ & 0x00040000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(50, employeeId_);
     }
-    if (((bitField1_ & 0x00040000) != 0)) {
+    if (((bitField1_ & 0x00080000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(51, employeeNumber_);
     }
-    if (((bitField1_ & 0x00080000) != 0)) {
+    if (((bitField1_ & 0x00100000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(52, employeeType_);
     }
-    if (((bitField1_ & 0x00100000) != 0)) {
+    if (((bitField1_ & 0x00200000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(53, initials_);
     }
-    if (((bitField1_ & 0x00200000) != 0)) {
+    if (((bitField1_ & 0x00400000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(54, middleName_);
     }
-    if (((bitField1_ & 0x00400000) != 0)) {
+    if (((bitField1_ & 0x00800000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(55, primaryGroupOid_);
     }
-    if (((bitField1_ & 0x00800000) != 0)) {
+    if (((bitField1_ & 0x01000000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(56, managerOid_);
     }
     {
@@ -2780,6 +2831,9 @@ private static final long serialVersionUID = 0L;
       size += dataSize;
       size += 2 * getMemberOfOidList().size();
     }
+    if (((bitField0_ & 0x00000010) != 0)) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(58, domain_);
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -2815,6 +2869,11 @@ private static final long serialVersionUID = 0L;
       if (!getOu()
           .equals(other.getOu())) return false;
     }
+    if (hasDomain() != other.hasDomain()) return false;
+    if (hasDomain()) {
+      if (!getDomain()
+          .equals(other.getDomain())) return false;
+    }
     if (hasDescription() != other.hasDescription()) return false;
     if (hasDescription()) {
       if (!getDescription()
@@ -3104,6 +3163,10 @@ private static final long serialVersionUID = 0L;
       hash = (37 * hash) + OU_FIELD_NUMBER;
       hash = (53 * hash) + getOu().hashCode();
     }
+    if (hasDomain()) {
+      hash = (37 * hash) + DOMAIN_FIELD_NUMBER;
+      hash = (53 * hash) + getDomain().hashCode();
+    }
     if (hasDescription()) {
       hash = (37 * hash) + DESCRIPTION_FIELD_NUMBER;
       hash = (53 * hash) + getDescription().hashCode();
@@ -3478,6 +3541,7 @@ private static final long serialVersionUID = 0L;
       samAccountName_ = "";
       cn_ = "";
       ou_ = "";
+      domain_ = "";
       description_ = "";
       comment_ = "";
       company_ = "";
@@ -3614,129 +3678,129 @@ private static final long serialVersionUID = 0L;
         to_bitField0_ |= 0x00000008;
       }
       if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.description_ = description_;
+        result.domain_ = domain_;
         to_bitField0_ |= 0x00000010;
       }
       if (((from_bitField0_ & 0x00000020) != 0)) {
-        result.comment_ = comment_;
+        result.description_ = description_;
         to_bitField0_ |= 0x00000020;
       }
       if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.company_ = company_;
+        result.comment_ = comment_;
         to_bitField0_ |= 0x00000040;
       }
       if (((from_bitField0_ & 0x00000080) != 0)) {
-        result.primaryGroupId_ = primaryGroupId_;
+        result.company_ = company_;
         to_bitField0_ |= 0x00000080;
       }
       if (((from_bitField0_ & 0x00000100) != 0)) {
-        result.enabled_ = enabled_;
+        result.primaryGroupId_ = primaryGroupId_;
         to_bitField0_ |= 0x00000100;
       }
       if (((from_bitField0_ & 0x00000200) != 0)) {
-        result.userAccountControl_ = userAccountControl_;
+        result.enabled_ = enabled_;
         to_bitField0_ |= 0x00000200;
       }
       if (((from_bitField0_ & 0x00000400) != 0)) {
+        result.userAccountControl_ = userAccountControl_;
+        to_bitField0_ |= 0x00000400;
+      }
+      if (((from_bitField0_ & 0x00000800) != 0)) {
         result.accountExpires_ = accountExpiresBuilder_ == null
             ? accountExpires_
             : accountExpiresBuilder_.build();
-        to_bitField0_ |= 0x00000400;
+        to_bitField0_ |= 0x00000800;
       }
-      if (((from_bitField0_ & 0x00000800) != 0)) {
+      if (((from_bitField0_ & 0x00001000) != 0)) {
         result.lockoutTime_ = lockoutTimeBuilder_ == null
             ? lockoutTime_
             : lockoutTimeBuilder_.build();
-        to_bitField0_ |= 0x00000800;
+        to_bitField0_ |= 0x00001000;
       }
-      if (((from_bitField0_ & 0x00001000) != 0)) {
+      if (((from_bitField0_ & 0x00002000) != 0)) {
         result.passwordLastSet_ = passwordLastSetBuilder_ == null
             ? passwordLastSet_
             : passwordLastSetBuilder_.build();
-        to_bitField0_ |= 0x00001000;
+        to_bitField0_ |= 0x00002000;
       }
-      if (((from_bitField0_ & 0x00002000) != 0)) {
+      if (((from_bitField0_ & 0x00004000) != 0)) {
         result.lastLogon_ = lastLogonBuilder_ == null
             ? lastLogon_
             : lastLogonBuilder_.build();
-        to_bitField0_ |= 0x00002000;
+        to_bitField0_ |= 0x00004000;
       }
-      if (((from_bitField0_ & 0x00004000) != 0)) {
+      if (((from_bitField0_ & 0x00008000) != 0)) {
         result.lockoutDate_ = lockoutDateBuilder_ == null
             ? lockoutDate_
             : lockoutDateBuilder_.build();
-        to_bitField0_ |= 0x00004000;
-      }
-      if (((from_bitField0_ & 0x00008000) != 0)) {
-        result.canUserChangePassword_ = canUserChangePassword_;
         to_bitField0_ |= 0x00008000;
       }
       if (((from_bitField0_ & 0x00010000) != 0)) {
-        result.passwordExpirationDate_ = passwordExpirationDateBuilder_ == null
-            ? passwordExpirationDate_
-            : passwordExpirationDateBuilder_.build();
+        result.canUserChangePassword_ = canUserChangePassword_;
         to_bitField0_ |= 0x00010000;
       }
       if (((from_bitField0_ & 0x00020000) != 0)) {
-        result.passwordNeverExpires_ = passwordNeverExpires_;
+        result.passwordExpirationDate_ = passwordExpirationDateBuilder_ == null
+            ? passwordExpirationDate_
+            : passwordExpirationDateBuilder_.build();
         to_bitField0_ |= 0x00020000;
       }
       if (((from_bitField0_ & 0x00040000) != 0)) {
-        result.passwordRequired_ = passwordRequired_;
+        result.passwordNeverExpires_ = passwordNeverExpires_;
         to_bitField0_ |= 0x00040000;
       }
       if (((from_bitField0_ & 0x00080000) != 0)) {
-        result.passwordChangeableDate_ = passwordChangeableDateBuilder_ == null
-            ? passwordChangeableDate_
-            : passwordChangeableDateBuilder_.build();
+        result.passwordRequired_ = passwordRequired_;
         to_bitField0_ |= 0x00080000;
       }
       if (((from_bitField0_ & 0x00100000) != 0)) {
-        result.email_ = email_;
+        result.passwordChangeableDate_ = passwordChangeableDateBuilder_ == null
+            ? passwordChangeableDate_
+            : passwordChangeableDateBuilder_.build();
         to_bitField0_ |= 0x00100000;
       }
       if (((from_bitField0_ & 0x00200000) != 0)) {
-        result.displayName_ = displayName_;
+        result.email_ = email_;
         to_bitField0_ |= 0x00200000;
       }
       if (((from_bitField0_ & 0x00400000) != 0)) {
-        result.givenName_ = givenName_;
+        result.displayName_ = displayName_;
         to_bitField0_ |= 0x00400000;
       }
       if (((from_bitField0_ & 0x00800000) != 0)) {
-        result.surname_ = surname_;
+        result.givenName_ = givenName_;
         to_bitField0_ |= 0x00800000;
       }
       if (((from_bitField0_ & 0x01000000) != 0)) {
-        result.telephone_ = telephone_;
+        result.surname_ = surname_;
         to_bitField0_ |= 0x01000000;
       }
       if (((from_bitField0_ & 0x02000000) != 0)) {
-        result.facSimile_ = facSimile_;
+        result.telephone_ = telephone_;
         to_bitField0_ |= 0x02000000;
       }
       if (((from_bitField0_ & 0x04000000) != 0)) {
-        result.mobile_ = mobile_;
+        result.facSimile_ = facSimile_;
         to_bitField0_ |= 0x04000000;
       }
       if (((from_bitField0_ & 0x08000000) != 0)) {
-        result.streetAddress_ = streetAddress_;
+        result.mobile_ = mobile_;
         to_bitField0_ |= 0x08000000;
       }
       if (((from_bitField0_ & 0x10000000) != 0)) {
-        result.city_ = city_;
+        result.streetAddress_ = streetAddress_;
         to_bitField0_ |= 0x10000000;
       }
       if (((from_bitField0_ & 0x20000000) != 0)) {
-        result.country_ = country_;
+        result.city_ = city_;
         to_bitField0_ |= 0x20000000;
       }
       if (((from_bitField0_ & 0x40000000) != 0)) {
-        result.department_ = department_;
+        result.country_ = country_;
         to_bitField0_ |= 0x40000000;
       }
       if (((from_bitField0_ & 0x80000000) != 0)) {
-        result.deliveryOfficeName_ = deliveryOfficeName_;
+        result.department_ = department_;
         to_bitField0_ |= 0x80000000;
       }
       result.bitField0_ |= to_bitField0_;
@@ -3746,102 +3810,106 @@ private static final long serialVersionUID = 0L;
       int from_bitField1_ = bitField1_;
       int to_bitField1_ = 0;
       if (((from_bitField1_ & 0x00000001) != 0)) {
-        result.countryAbbreviation_ = countryAbbreviation_;
+        result.deliveryOfficeName_ = deliveryOfficeName_;
         to_bitField1_ |= 0x00000001;
       }
       if (((from_bitField1_ & 0x00000002) != 0)) {
-        result.postalCode_ = postalCode_;
+        result.countryAbbreviation_ = countryAbbreviation_;
         to_bitField1_ |= 0x00000002;
       }
       if (((from_bitField1_ & 0x00000004) != 0)) {
-        result.countryCode_ = countryCode_;
+        result.postalCode_ = postalCode_;
         to_bitField1_ |= 0x00000004;
       }
       if (((from_bitField1_ & 0x00000008) != 0)) {
-        result.principalName_ = principalName_;
+        result.countryCode_ = countryCode_;
         to_bitField1_ |= 0x00000008;
       }
       if (((from_bitField1_ & 0x00000010) != 0)) {
-        result.title_ = title_;
+        result.principalName_ = principalName_;
         to_bitField1_ |= 0x00000010;
       }
       if (((from_bitField1_ & 0x00000020) != 0)) {
-        result.division_ = division_;
+        result.title_ = title_;
         to_bitField1_ |= 0x00000020;
       }
       if (((from_bitField1_ & 0x00000040) != 0)) {
-        result.info_ = info_;
+        result.division_ = division_;
         to_bitField1_ |= 0x00000040;
       }
       if (((from_bitField1_ & 0x00000080) != 0)) {
-        result.homePhone_ = homePhone_;
+        result.info_ = info_;
         to_bitField1_ |= 0x00000080;
       }
       if (((from_bitField1_ & 0x00000100) != 0)) {
-        result.pager_ = pager_;
+        result.homePhone_ = homePhone_;
         to_bitField1_ |= 0x00000100;
       }
       if (((from_bitField1_ & 0x00000200) != 0)) {
-        result.ipPhone_ = ipPhone_;
+        result.pager_ = pager_;
         to_bitField1_ |= 0x00000200;
       }
       if (((from_bitField1_ & 0x00000400) != 0)) {
-        result.homePage_ = homePage_;
+        result.ipPhone_ = ipPhone_;
         to_bitField1_ |= 0x00000400;
       }
       if (((from_bitField1_ & 0x00000800) != 0)) {
-        result.postOfficeBox_ = postOfficeBox_;
+        result.homePage_ = homePage_;
         to_bitField1_ |= 0x00000800;
       }
       if (((from_bitField1_ & 0x00001000) != 0)) {
-        result.state_ = state_;
+        result.postOfficeBox_ = postOfficeBox_;
         to_bitField1_ |= 0x00001000;
       }
       if (((from_bitField1_ & 0x00002000) != 0)) {
-        result.profilePath_ = profilePath_;
+        result.state_ = state_;
         to_bitField1_ |= 0x00002000;
       }
       if (((from_bitField1_ & 0x00004000) != 0)) {
-        result.scriptPath_ = scriptPath_;
+        result.profilePath_ = profilePath_;
         to_bitField1_ |= 0x00004000;
       }
       if (((from_bitField1_ & 0x00008000) != 0)) {
-        result.homeDirectory_ = homeDirectory_;
+        result.scriptPath_ = scriptPath_;
         to_bitField1_ |= 0x00008000;
       }
       if (((from_bitField1_ & 0x00010000) != 0)) {
-        result.thumbnailPhoto_ = thumbnailPhoto_;
+        result.homeDirectory_ = homeDirectory_;
         to_bitField1_ |= 0x00010000;
       }
       if (((from_bitField1_ & 0x00020000) != 0)) {
-        result.employeeId_ = employeeId_;
+        result.thumbnailPhoto_ = thumbnailPhoto_;
         to_bitField1_ |= 0x00020000;
       }
       if (((from_bitField1_ & 0x00040000) != 0)) {
-        result.employeeNumber_ = employeeNumber_;
+        result.employeeId_ = employeeId_;
         to_bitField1_ |= 0x00040000;
       }
       if (((from_bitField1_ & 0x00080000) != 0)) {
-        result.employeeType_ = employeeType_;
+        result.employeeNumber_ = employeeNumber_;
         to_bitField1_ |= 0x00080000;
       }
       if (((from_bitField1_ & 0x00100000) != 0)) {
-        result.initials_ = initials_;
+        result.employeeType_ = employeeType_;
         to_bitField1_ |= 0x00100000;
       }
       if (((from_bitField1_ & 0x00200000) != 0)) {
-        result.middleName_ = middleName_;
+        result.initials_ = initials_;
         to_bitField1_ |= 0x00200000;
       }
       if (((from_bitField1_ & 0x00400000) != 0)) {
-        result.primaryGroupOid_ = primaryGroupOid_;
+        result.middleName_ = middleName_;
         to_bitField1_ |= 0x00400000;
       }
       if (((from_bitField1_ & 0x00800000) != 0)) {
-        result.managerOid_ = managerOid_;
+        result.primaryGroupOid_ = primaryGroupOid_;
         to_bitField1_ |= 0x00800000;
       }
       if (((from_bitField1_ & 0x01000000) != 0)) {
+        result.managerOid_ = managerOid_;
+        to_bitField1_ |= 0x01000000;
+      }
+      if (((from_bitField1_ & 0x02000000) != 0)) {
         memberOfOid_.makeImmutable();
         result.memberOfOid_ = memberOfOid_;
       }
@@ -3910,19 +3978,24 @@ private static final long serialVersionUID = 0L;
         bitField0_ |= 0x00000008;
         onChanged();
       }
+      if (other.hasDomain()) {
+        domain_ = other.domain_;
+        bitField0_ |= 0x00000010;
+        onChanged();
+      }
       if (other.hasDescription()) {
         description_ = other.description_;
-        bitField0_ |= 0x00000010;
+        bitField0_ |= 0x00000020;
         onChanged();
       }
       if (other.hasComment()) {
         comment_ = other.comment_;
-        bitField0_ |= 0x00000020;
+        bitField0_ |= 0x00000040;
         onChanged();
       }
       if (other.hasCompany()) {
         company_ = other.company_;
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000080;
         onChanged();
       }
       if (other.hasPrimaryGroupId()) {
@@ -3966,142 +4039,142 @@ private static final long serialVersionUID = 0L;
       }
       if (other.hasEmail()) {
         email_ = other.email_;
-        bitField0_ |= 0x00100000;
+        bitField0_ |= 0x00200000;
         onChanged();
       }
       if (other.hasDisplayName()) {
         displayName_ = other.displayName_;
-        bitField0_ |= 0x00200000;
+        bitField0_ |= 0x00400000;
         onChanged();
       }
       if (other.hasGivenName()) {
         givenName_ = other.givenName_;
-        bitField0_ |= 0x00400000;
+        bitField0_ |= 0x00800000;
         onChanged();
       }
       if (other.hasSurname()) {
         surname_ = other.surname_;
-        bitField0_ |= 0x00800000;
+        bitField0_ |= 0x01000000;
         onChanged();
       }
       if (other.hasTelephone()) {
         telephone_ = other.telephone_;
-        bitField0_ |= 0x01000000;
+        bitField0_ |= 0x02000000;
         onChanged();
       }
       if (other.hasFacSimile()) {
         facSimile_ = other.facSimile_;
-        bitField0_ |= 0x02000000;
+        bitField0_ |= 0x04000000;
         onChanged();
       }
       if (other.hasMobile()) {
         mobile_ = other.mobile_;
-        bitField0_ |= 0x04000000;
+        bitField0_ |= 0x08000000;
         onChanged();
       }
       if (other.hasStreetAddress()) {
         streetAddress_ = other.streetAddress_;
-        bitField0_ |= 0x08000000;
+        bitField0_ |= 0x10000000;
         onChanged();
       }
       if (other.hasCity()) {
         city_ = other.city_;
-        bitField0_ |= 0x10000000;
+        bitField0_ |= 0x20000000;
         onChanged();
       }
       if (other.hasCountry()) {
         country_ = other.country_;
-        bitField0_ |= 0x20000000;
+        bitField0_ |= 0x40000000;
         onChanged();
       }
       if (other.hasDepartment()) {
         department_ = other.department_;
-        bitField0_ |= 0x40000000;
+        bitField0_ |= 0x80000000;
         onChanged();
       }
       if (other.hasDeliveryOfficeName()) {
         deliveryOfficeName_ = other.deliveryOfficeName_;
-        bitField0_ |= 0x80000000;
+        bitField1_ |= 0x00000001;
         onChanged();
       }
       if (other.hasCountryAbbreviation()) {
         countryAbbreviation_ = other.countryAbbreviation_;
-        bitField1_ |= 0x00000001;
+        bitField1_ |= 0x00000002;
         onChanged();
       }
       if (other.hasPostalCode()) {
         postalCode_ = other.postalCode_;
-        bitField1_ |= 0x00000002;
+        bitField1_ |= 0x00000004;
         onChanged();
       }
       if (other.hasCountryCode()) {
         countryCode_ = other.countryCode_;
-        bitField1_ |= 0x00000004;
+        bitField1_ |= 0x00000008;
         onChanged();
       }
       if (other.hasPrincipalName()) {
         principalName_ = other.principalName_;
-        bitField1_ |= 0x00000008;
+        bitField1_ |= 0x00000010;
         onChanged();
       }
       if (other.hasTitle()) {
         title_ = other.title_;
-        bitField1_ |= 0x00000010;
+        bitField1_ |= 0x00000020;
         onChanged();
       }
       if (other.hasDivision()) {
         division_ = other.division_;
-        bitField1_ |= 0x00000020;
+        bitField1_ |= 0x00000040;
         onChanged();
       }
       if (other.hasInfo()) {
         info_ = other.info_;
-        bitField1_ |= 0x00000040;
+        bitField1_ |= 0x00000080;
         onChanged();
       }
       if (other.hasHomePhone()) {
         homePhone_ = other.homePhone_;
-        bitField1_ |= 0x00000080;
+        bitField1_ |= 0x00000100;
         onChanged();
       }
       if (other.hasPager()) {
         pager_ = other.pager_;
-        bitField1_ |= 0x00000100;
+        bitField1_ |= 0x00000200;
         onChanged();
       }
       if (other.hasIpPhone()) {
         ipPhone_ = other.ipPhone_;
-        bitField1_ |= 0x00000200;
+        bitField1_ |= 0x00000400;
         onChanged();
       }
       if (other.hasHomePage()) {
         homePage_ = other.homePage_;
-        bitField1_ |= 0x00000400;
+        bitField1_ |= 0x00000800;
         onChanged();
       }
       if (other.hasPostOfficeBox()) {
         postOfficeBox_ = other.postOfficeBox_;
-        bitField1_ |= 0x00000800;
+        bitField1_ |= 0x00001000;
         onChanged();
       }
       if (other.hasState()) {
         state_ = other.state_;
-        bitField1_ |= 0x00001000;
+        bitField1_ |= 0x00002000;
         onChanged();
       }
       if (other.hasProfilePath()) {
         profilePath_ = other.profilePath_;
-        bitField1_ |= 0x00002000;
+        bitField1_ |= 0x00004000;
         onChanged();
       }
       if (other.hasScriptPath()) {
         scriptPath_ = other.scriptPath_;
-        bitField1_ |= 0x00004000;
+        bitField1_ |= 0x00008000;
         onChanged();
       }
       if (other.hasHomeDirectory()) {
         homeDirectory_ = other.homeDirectory_;
-        bitField1_ |= 0x00008000;
+        bitField1_ |= 0x00010000;
         onChanged();
       }
       if (other.hasThumbnailPhoto()) {
@@ -4109,43 +4182,43 @@ private static final long serialVersionUID = 0L;
       }
       if (other.hasEmployeeId()) {
         employeeId_ = other.employeeId_;
-        bitField1_ |= 0x00020000;
+        bitField1_ |= 0x00040000;
         onChanged();
       }
       if (other.hasEmployeeNumber()) {
         employeeNumber_ = other.employeeNumber_;
-        bitField1_ |= 0x00040000;
+        bitField1_ |= 0x00080000;
         onChanged();
       }
       if (other.hasEmployeeType()) {
         employeeType_ = other.employeeType_;
-        bitField1_ |= 0x00080000;
+        bitField1_ |= 0x00100000;
         onChanged();
       }
       if (other.hasInitials()) {
         initials_ = other.initials_;
-        bitField1_ |= 0x00100000;
+        bitField1_ |= 0x00200000;
         onChanged();
       }
       if (other.hasMiddleName()) {
         middleName_ = other.middleName_;
-        bitField1_ |= 0x00200000;
+        bitField1_ |= 0x00400000;
         onChanged();
       }
       if (other.hasPrimaryGroupOid()) {
         primaryGroupOid_ = other.primaryGroupOid_;
-        bitField1_ |= 0x00400000;
+        bitField1_ |= 0x00800000;
         onChanged();
       }
       if (other.hasManagerOid()) {
         managerOid_ = other.managerOid_;
-        bitField1_ |= 0x00800000;
+        bitField1_ |= 0x01000000;
         onChanged();
       }
       if (!other.memberOfOid_.isEmpty()) {
         if (memberOfOid_.isEmpty()) {
           memberOfOid_ = other.memberOfOid_;
-          bitField1_ |= 0x01000000;
+          bitField1_ |= 0x02000000;
         } else {
           ensureMemberOfOidIsMutable();
           memberOfOid_.addAll(other.memberOfOid_);
@@ -4202,276 +4275,276 @@ private static final long serialVersionUID = 0L;
             } // case 34
             case 42: {
               description_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x00000010;
+              bitField0_ |= 0x00000020;
               break;
             } // case 42
             case 50: {
               comment_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x00000020;
+              bitField0_ |= 0x00000040;
               break;
             } // case 50
             case 58: {
               company_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x00000040;
+              bitField0_ |= 0x00000080;
               break;
             } // case 58
             case 64: {
               primaryGroupId_ = input.readInt32();
-              bitField0_ |= 0x00000080;
+              bitField0_ |= 0x00000100;
               break;
             } // case 64
             case 72: {
               enabled_ = input.readBool();
-              bitField0_ |= 0x00000100;
+              bitField0_ |= 0x00000200;
               break;
             } // case 72
             case 80: {
               userAccountControl_ = input.readInt32();
-              bitField0_ |= 0x00000200;
+              bitField0_ |= 0x00000400;
               break;
             } // case 80
             case 90: {
               input.readMessage(
                   getAccountExpiresFieldBuilder().getBuilder(),
                   extensionRegistry);
-              bitField0_ |= 0x00000400;
+              bitField0_ |= 0x00000800;
               break;
             } // case 90
             case 98: {
               input.readMessage(
                   getLockoutTimeFieldBuilder().getBuilder(),
                   extensionRegistry);
-              bitField0_ |= 0x00000800;
+              bitField0_ |= 0x00001000;
               break;
             } // case 98
             case 106: {
               input.readMessage(
                   getPasswordLastSetFieldBuilder().getBuilder(),
                   extensionRegistry);
-              bitField0_ |= 0x00001000;
+              bitField0_ |= 0x00002000;
               break;
             } // case 106
             case 114: {
               input.readMessage(
                   getLastLogonFieldBuilder().getBuilder(),
                   extensionRegistry);
-              bitField0_ |= 0x00002000;
+              bitField0_ |= 0x00004000;
               break;
             } // case 114
             case 122: {
               input.readMessage(
                   getLockoutDateFieldBuilder().getBuilder(),
                   extensionRegistry);
-              bitField0_ |= 0x00004000;
+              bitField0_ |= 0x00008000;
               break;
             } // case 122
             case 128: {
               canUserChangePassword_ = input.readBool();
-              bitField0_ |= 0x00008000;
+              bitField0_ |= 0x00010000;
               break;
             } // case 128
             case 138: {
               input.readMessage(
                   getPasswordExpirationDateFieldBuilder().getBuilder(),
                   extensionRegistry);
-              bitField0_ |= 0x00010000;
+              bitField0_ |= 0x00020000;
               break;
             } // case 138
             case 144: {
               passwordNeverExpires_ = input.readBool();
-              bitField0_ |= 0x00020000;
+              bitField0_ |= 0x00040000;
               break;
             } // case 144
             case 152: {
               passwordRequired_ = input.readBool();
-              bitField0_ |= 0x00040000;
+              bitField0_ |= 0x00080000;
               break;
             } // case 152
             case 162: {
               input.readMessage(
                   getPasswordChangeableDateFieldBuilder().getBuilder(),
                   extensionRegistry);
-              bitField0_ |= 0x00080000;
+              bitField0_ |= 0x00100000;
               break;
             } // case 162
             case 170: {
               email_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x00100000;
+              bitField0_ |= 0x00200000;
               break;
             } // case 170
             case 178: {
               displayName_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x00200000;
+              bitField0_ |= 0x00400000;
               break;
             } // case 178
             case 186: {
               givenName_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x00400000;
+              bitField0_ |= 0x00800000;
               break;
             } // case 186
             case 194: {
               surname_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x00800000;
+              bitField0_ |= 0x01000000;
               break;
             } // case 194
             case 202: {
               telephone_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x01000000;
+              bitField0_ |= 0x02000000;
               break;
             } // case 202
             case 210: {
               facSimile_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x02000000;
+              bitField0_ |= 0x04000000;
               break;
             } // case 210
             case 218: {
               mobile_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x04000000;
+              bitField0_ |= 0x08000000;
               break;
             } // case 218
             case 226: {
               streetAddress_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x08000000;
+              bitField0_ |= 0x10000000;
               break;
             } // case 226
             case 234: {
               city_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x10000000;
+              bitField0_ |= 0x20000000;
               break;
             } // case 234
             case 242: {
               country_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x20000000;
+              bitField0_ |= 0x40000000;
               break;
             } // case 242
             case 250: {
               department_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x40000000;
+              bitField0_ |= 0x80000000;
               break;
             } // case 250
             case 258: {
               deliveryOfficeName_ = input.readStringRequireUtf8();
-              bitField0_ |= 0x80000000;
+              bitField1_ |= 0x00000001;
               break;
             } // case 258
             case 266: {
               countryAbbreviation_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000001;
+              bitField1_ |= 0x00000002;
               break;
             } // case 266
             case 274: {
               postalCode_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000002;
+              bitField1_ |= 0x00000004;
               break;
             } // case 274
             case 282: {
               countryCode_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000004;
+              bitField1_ |= 0x00000008;
               break;
             } // case 282
             case 290: {
               principalName_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000008;
+              bitField1_ |= 0x00000010;
               break;
             } // case 290
             case 298: {
               title_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000010;
+              bitField1_ |= 0x00000020;
               break;
             } // case 298
             case 306: {
               division_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000020;
+              bitField1_ |= 0x00000040;
               break;
             } // case 306
             case 314: {
               info_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000040;
+              bitField1_ |= 0x00000080;
               break;
             } // case 314
             case 322: {
               homePhone_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000080;
+              bitField1_ |= 0x00000100;
               break;
             } // case 322
             case 330: {
               pager_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000100;
+              bitField1_ |= 0x00000200;
               break;
             } // case 330
             case 338: {
               ipPhone_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000200;
+              bitField1_ |= 0x00000400;
               break;
             } // case 338
             case 346: {
               homePage_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000400;
+              bitField1_ |= 0x00000800;
               break;
             } // case 346
             case 354: {
               postOfficeBox_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00000800;
+              bitField1_ |= 0x00001000;
               break;
             } // case 354
             case 362: {
               state_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00001000;
+              bitField1_ |= 0x00002000;
               break;
             } // case 362
             case 370: {
               profilePath_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00002000;
+              bitField1_ |= 0x00004000;
               break;
             } // case 370
             case 378: {
               scriptPath_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00004000;
+              bitField1_ |= 0x00008000;
               break;
             } // case 378
             case 386: {
               homeDirectory_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00008000;
+              bitField1_ |= 0x00010000;
               break;
             } // case 386
             case 394: {
               thumbnailPhoto_ = input.readBytes();
-              bitField1_ |= 0x00010000;
+              bitField1_ |= 0x00020000;
               break;
             } // case 394
             case 402: {
               employeeId_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00020000;
+              bitField1_ |= 0x00040000;
               break;
             } // case 402
             case 410: {
               employeeNumber_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00040000;
+              bitField1_ |= 0x00080000;
               break;
             } // case 410
             case 418: {
               employeeType_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00080000;
+              bitField1_ |= 0x00100000;
               break;
             } // case 418
             case 426: {
               initials_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00100000;
+              bitField1_ |= 0x00200000;
               break;
             } // case 426
             case 434: {
               middleName_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00200000;
+              bitField1_ |= 0x00400000;
               break;
             } // case 434
             case 442: {
               primaryGroupOid_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00400000;
+              bitField1_ |= 0x00800000;
               break;
             } // case 442
             case 450: {
               managerOid_ = input.readStringRequireUtf8();
-              bitField1_ |= 0x00800000;
+              bitField1_ |= 0x01000000;
               break;
             } // case 450
             case 458: {
@@ -4480,6 +4553,11 @@ private static final long serialVersionUID = 0L;
               memberOfOid_.add(s);
               break;
             } // case 458
+            case 466: {
+              domain_ = input.readStringRequireUtf8();
+              bitField0_ |= 0x00000010;
+              break;
+            } // case 466
             default: {
               if (!super.parseUnknownField(input, extensionRegistry, tag)) {
                 done = true; // was an endgroup tag
@@ -4856,13 +4934,92 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
+    private java.lang.Object domain_ = "";
+    /**
+     * <code>optional string domain = 58;</code>
+     * @return Whether the domain field is set.
+     */
+    public boolean hasDomain() {
+      return ((bitField0_ & 0x00000010) != 0);
+    }
+    /**
+     * <code>optional string domain = 58;</code>
+     * @return The domain.
+     */
+    public java.lang.String getDomain() {
+      java.lang.Object ref = domain_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        domain_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <code>optional string domain = 58;</code>
+     * @return The bytes for domain.
+     */
+    public com.google.protobuf.ByteString
+        getDomainBytes() {
+      java.lang.Object ref = domain_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        domain_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <code>optional string domain = 58;</code>
+     * @param value The domain to set.
+     * @return This builder for chaining.
+     */
+    public Builder setDomain(
+        java.lang.String value) {
+      if (value == null) { throw new NullPointerException(); }
+      domain_ = value;
+      bitField0_ |= 0x00000010;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>optional string domain = 58;</code>
+     * @return This builder for chaining.
+     */
+    public Builder clearDomain() {
+      domain_ = getDefaultInstance().getDomain();
+      bitField0_ = (bitField0_ & ~0x00000010);
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>optional string domain = 58;</code>
+     * @param value The bytes for domain to set.
+     * @return This builder for chaining.
+     */
+    public Builder setDomainBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) { throw new NullPointerException(); }
+      checkByteStringIsUtf8(value);
+      domain_ = value;
+      bitField0_ |= 0x00000010;
+      onChanged();
+      return this;
+    }
+
     private java.lang.Object description_ = "";
     /**
      * <code>optional string description = 5;</code>
      * @return Whether the description field is set.
      */
     public boolean hasDescription() {
-      return ((bitField0_ & 0x00000010) != 0);
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      * <code>optional string description = 5;</code>
@@ -4906,7 +5063,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       description_ = value;
-      bitField0_ |= 0x00000010;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -4916,7 +5073,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearDescription() {
       description_ = getDefaultInstance().getDescription();
-      bitField0_ = (bitField0_ & ~0x00000010);
+      bitField0_ = (bitField0_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -4930,7 +5087,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       description_ = value;
-      bitField0_ |= 0x00000010;
+      bitField0_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -4941,7 +5098,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the comment field is set.
      */
     public boolean hasComment() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      * <code>optional string comment = 6;</code>
@@ -4985,7 +5142,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       comment_ = value;
-      bitField0_ |= 0x00000020;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -4995,7 +5152,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearComment() {
       comment_ = getDefaultInstance().getComment();
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -5009,7 +5166,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       comment_ = value;
-      bitField0_ |= 0x00000020;
+      bitField0_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -5020,7 +5177,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the company field is set.
      */
     public boolean hasCompany() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      * <code>optional string company = 7;</code>
@@ -5064,7 +5221,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       company_ = value;
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -5074,7 +5231,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearCompany() {
       company_ = getDefaultInstance().getCompany();
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -5088,7 +5245,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       company_ = value;
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -5100,7 +5257,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasPrimaryGroupId() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      * <code>optional int32 primary_group_id = 8;</code>
@@ -5118,7 +5275,7 @@ private static final long serialVersionUID = 0L;
     public Builder setPrimaryGroupId(int value) {
 
       primaryGroupId_ = value;
-      bitField0_ |= 0x00000080;
+      bitField0_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -5127,7 +5284,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearPrimaryGroupId() {
-      bitField0_ = (bitField0_ & ~0x00000080);
+      bitField0_ = (bitField0_ & ~0x00000100);
       primaryGroupId_ = 0;
       onChanged();
       return this;
@@ -5140,7 +5297,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasEnabled() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      * <code>optional bool enabled = 9;</code>
@@ -5158,7 +5315,7 @@ private static final long serialVersionUID = 0L;
     public Builder setEnabled(boolean value) {
 
       enabled_ = value;
-      bitField0_ |= 0x00000100;
+      bitField0_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -5167,7 +5324,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearEnabled() {
-      bitField0_ = (bitField0_ & ~0x00000100);
+      bitField0_ = (bitField0_ & ~0x00000200);
       enabled_ = false;
       onChanged();
       return this;
@@ -5180,7 +5337,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasUserAccountControl() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return ((bitField0_ & 0x00000400) != 0);
     }
     /**
      * <code>optional int32 user_account_control = 10;</code>
@@ -5198,7 +5355,7 @@ private static final long serialVersionUID = 0L;
     public Builder setUserAccountControl(int value) {
 
       userAccountControl_ = value;
-      bitField0_ |= 0x00000200;
+      bitField0_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -5207,7 +5364,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearUserAccountControl() {
-      bitField0_ = (bitField0_ & ~0x00000200);
+      bitField0_ = (bitField0_ & ~0x00000400);
       userAccountControl_ = 0;
       onChanged();
       return this;
@@ -5221,7 +5378,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the accountExpires field is set.
      */
     public boolean hasAccountExpires() {
-      return ((bitField0_ & 0x00000400) != 0);
+      return ((bitField0_ & 0x00000800) != 0);
     }
     /**
      * <code>optional .google.protobuf.Timestamp account_expires = 11;</code>
@@ -5246,7 +5403,7 @@ private static final long serialVersionUID = 0L;
       } else {
         accountExpiresBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000400;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -5260,7 +5417,7 @@ private static final long serialVersionUID = 0L;
       } else {
         accountExpiresBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000400;
+      bitField0_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -5269,7 +5426,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder mergeAccountExpires(com.google.protobuf.Timestamp value) {
       if (accountExpiresBuilder_ == null) {
-        if (((bitField0_ & 0x00000400) != 0) &&
+        if (((bitField0_ & 0x00000800) != 0) &&
           accountExpires_ != null &&
           accountExpires_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
           getAccountExpiresBuilder().mergeFrom(value);
@@ -5280,7 +5437,7 @@ private static final long serialVersionUID = 0L;
         accountExpiresBuilder_.mergeFrom(value);
       }
       if (accountExpires_ != null) {
-        bitField0_ |= 0x00000400;
+        bitField0_ |= 0x00000800;
         onChanged();
       }
       return this;
@@ -5289,7 +5446,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp account_expires = 11;</code>
      */
     public Builder clearAccountExpires() {
-      bitField0_ = (bitField0_ & ~0x00000400);
+      bitField0_ = (bitField0_ & ~0x00000800);
       accountExpires_ = null;
       if (accountExpiresBuilder_ != null) {
         accountExpiresBuilder_.dispose();
@@ -5302,7 +5459,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp account_expires = 11;</code>
      */
     public com.google.protobuf.Timestamp.Builder getAccountExpiresBuilder() {
-      bitField0_ |= 0x00000400;
+      bitField0_ |= 0x00000800;
       onChanged();
       return getAccountExpiresFieldBuilder().getBuilder();
     }
@@ -5342,7 +5499,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the lockoutTime field is set.
      */
     public boolean hasLockoutTime() {
-      return ((bitField0_ & 0x00000800) != 0);
+      return ((bitField0_ & 0x00001000) != 0);
     }
     /**
      * <code>optional .google.protobuf.Timestamp lockout_time = 12;</code>
@@ -5367,7 +5524,7 @@ private static final long serialVersionUID = 0L;
       } else {
         lockoutTimeBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00000800;
+      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -5381,7 +5538,7 @@ private static final long serialVersionUID = 0L;
       } else {
         lockoutTimeBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00000800;
+      bitField0_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -5390,7 +5547,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder mergeLockoutTime(com.google.protobuf.Timestamp value) {
       if (lockoutTimeBuilder_ == null) {
-        if (((bitField0_ & 0x00000800) != 0) &&
+        if (((bitField0_ & 0x00001000) != 0) &&
           lockoutTime_ != null &&
           lockoutTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
           getLockoutTimeBuilder().mergeFrom(value);
@@ -5401,7 +5558,7 @@ private static final long serialVersionUID = 0L;
         lockoutTimeBuilder_.mergeFrom(value);
       }
       if (lockoutTime_ != null) {
-        bitField0_ |= 0x00000800;
+        bitField0_ |= 0x00001000;
         onChanged();
       }
       return this;
@@ -5410,7 +5567,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp lockout_time = 12;</code>
      */
     public Builder clearLockoutTime() {
-      bitField0_ = (bitField0_ & ~0x00000800);
+      bitField0_ = (bitField0_ & ~0x00001000);
       lockoutTime_ = null;
       if (lockoutTimeBuilder_ != null) {
         lockoutTimeBuilder_.dispose();
@@ -5423,7 +5580,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp lockout_time = 12;</code>
      */
     public com.google.protobuf.Timestamp.Builder getLockoutTimeBuilder() {
-      bitField0_ |= 0x00000800;
+      bitField0_ |= 0x00001000;
       onChanged();
       return getLockoutTimeFieldBuilder().getBuilder();
     }
@@ -5463,7 +5620,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the passwordLastSet field is set.
      */
     public boolean hasPasswordLastSet() {
-      return ((bitField0_ & 0x00001000) != 0);
+      return ((bitField0_ & 0x00002000) != 0);
     }
     /**
      * <code>optional .google.protobuf.Timestamp password_last_set = 13;</code>
@@ -5488,7 +5645,7 @@ private static final long serialVersionUID = 0L;
       } else {
         passwordLastSetBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00001000;
+      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -5502,7 +5659,7 @@ private static final long serialVersionUID = 0L;
       } else {
         passwordLastSetBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00001000;
+      bitField0_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -5511,7 +5668,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder mergePasswordLastSet(com.google.protobuf.Timestamp value) {
       if (passwordLastSetBuilder_ == null) {
-        if (((bitField0_ & 0x00001000) != 0) &&
+        if (((bitField0_ & 0x00002000) != 0) &&
           passwordLastSet_ != null &&
           passwordLastSet_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
           getPasswordLastSetBuilder().mergeFrom(value);
@@ -5522,7 +5679,7 @@ private static final long serialVersionUID = 0L;
         passwordLastSetBuilder_.mergeFrom(value);
       }
       if (passwordLastSet_ != null) {
-        bitField0_ |= 0x00001000;
+        bitField0_ |= 0x00002000;
         onChanged();
       }
       return this;
@@ -5531,7 +5688,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp password_last_set = 13;</code>
      */
     public Builder clearPasswordLastSet() {
-      bitField0_ = (bitField0_ & ~0x00001000);
+      bitField0_ = (bitField0_ & ~0x00002000);
       passwordLastSet_ = null;
       if (passwordLastSetBuilder_ != null) {
         passwordLastSetBuilder_.dispose();
@@ -5544,7 +5701,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp password_last_set = 13;</code>
      */
     public com.google.protobuf.Timestamp.Builder getPasswordLastSetBuilder() {
-      bitField0_ |= 0x00001000;
+      bitField0_ |= 0x00002000;
       onChanged();
       return getPasswordLastSetFieldBuilder().getBuilder();
     }
@@ -5584,7 +5741,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the lastLogon field is set.
      */
     public boolean hasLastLogon() {
-      return ((bitField0_ & 0x00002000) != 0);
+      return ((bitField0_ & 0x00004000) != 0);
     }
     /**
      * <code>optional .google.protobuf.Timestamp last_logon = 14;</code>
@@ -5609,7 +5766,7 @@ private static final long serialVersionUID = 0L;
       } else {
         lastLogonBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00002000;
+      bitField0_ |= 0x00004000;
       onChanged();
       return this;
     }
@@ -5623,7 +5780,7 @@ private static final long serialVersionUID = 0L;
       } else {
         lastLogonBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00002000;
+      bitField0_ |= 0x00004000;
       onChanged();
       return this;
     }
@@ -5632,7 +5789,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder mergeLastLogon(com.google.protobuf.Timestamp value) {
       if (lastLogonBuilder_ == null) {
-        if (((bitField0_ & 0x00002000) != 0) &&
+        if (((bitField0_ & 0x00004000) != 0) &&
           lastLogon_ != null &&
           lastLogon_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
           getLastLogonBuilder().mergeFrom(value);
@@ -5643,7 +5800,7 @@ private static final long serialVersionUID = 0L;
         lastLogonBuilder_.mergeFrom(value);
       }
       if (lastLogon_ != null) {
-        bitField0_ |= 0x00002000;
+        bitField0_ |= 0x00004000;
         onChanged();
       }
       return this;
@@ -5652,7 +5809,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp last_logon = 14;</code>
      */
     public Builder clearLastLogon() {
-      bitField0_ = (bitField0_ & ~0x00002000);
+      bitField0_ = (bitField0_ & ~0x00004000);
       lastLogon_ = null;
       if (lastLogonBuilder_ != null) {
         lastLogonBuilder_.dispose();
@@ -5665,7 +5822,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp last_logon = 14;</code>
      */
     public com.google.protobuf.Timestamp.Builder getLastLogonBuilder() {
-      bitField0_ |= 0x00002000;
+      bitField0_ |= 0x00004000;
       onChanged();
       return getLastLogonFieldBuilder().getBuilder();
     }
@@ -5705,7 +5862,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the lockoutDate field is set.
      */
     public boolean hasLockoutDate() {
-      return ((bitField0_ & 0x00004000) != 0);
+      return ((bitField0_ & 0x00008000) != 0);
     }
     /**
      * <code>optional .google.protobuf.Timestamp lockout_date = 15;</code>
@@ -5730,7 +5887,7 @@ private static final long serialVersionUID = 0L;
       } else {
         lockoutDateBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00004000;
+      bitField0_ |= 0x00008000;
       onChanged();
       return this;
     }
@@ -5744,7 +5901,7 @@ private static final long serialVersionUID = 0L;
       } else {
         lockoutDateBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00004000;
+      bitField0_ |= 0x00008000;
       onChanged();
       return this;
     }
@@ -5753,7 +5910,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder mergeLockoutDate(com.google.protobuf.Timestamp value) {
       if (lockoutDateBuilder_ == null) {
-        if (((bitField0_ & 0x00004000) != 0) &&
+        if (((bitField0_ & 0x00008000) != 0) &&
           lockoutDate_ != null &&
           lockoutDate_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
           getLockoutDateBuilder().mergeFrom(value);
@@ -5764,7 +5921,7 @@ private static final long serialVersionUID = 0L;
         lockoutDateBuilder_.mergeFrom(value);
       }
       if (lockoutDate_ != null) {
-        bitField0_ |= 0x00004000;
+        bitField0_ |= 0x00008000;
         onChanged();
       }
       return this;
@@ -5773,7 +5930,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp lockout_date = 15;</code>
      */
     public Builder clearLockoutDate() {
-      bitField0_ = (bitField0_ & ~0x00004000);
+      bitField0_ = (bitField0_ & ~0x00008000);
       lockoutDate_ = null;
       if (lockoutDateBuilder_ != null) {
         lockoutDateBuilder_.dispose();
@@ -5786,7 +5943,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp lockout_date = 15;</code>
      */
     public com.google.protobuf.Timestamp.Builder getLockoutDateBuilder() {
-      bitField0_ |= 0x00004000;
+      bitField0_ |= 0x00008000;
       onChanged();
       return getLockoutDateFieldBuilder().getBuilder();
     }
@@ -5825,7 +5982,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasCanUserChangePassword() {
-      return ((bitField0_ & 0x00008000) != 0);
+      return ((bitField0_ & 0x00010000) != 0);
     }
     /**
      * <code>optional bool can_user_change_password = 16;</code>
@@ -5843,7 +6000,7 @@ private static final long serialVersionUID = 0L;
     public Builder setCanUserChangePassword(boolean value) {
 
       canUserChangePassword_ = value;
-      bitField0_ |= 0x00008000;
+      bitField0_ |= 0x00010000;
       onChanged();
       return this;
     }
@@ -5852,7 +6009,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearCanUserChangePassword() {
-      bitField0_ = (bitField0_ & ~0x00008000);
+      bitField0_ = (bitField0_ & ~0x00010000);
       canUserChangePassword_ = false;
       onChanged();
       return this;
@@ -5866,7 +6023,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the passwordExpirationDate field is set.
      */
     public boolean hasPasswordExpirationDate() {
-      return ((bitField0_ & 0x00010000) != 0);
+      return ((bitField0_ & 0x00020000) != 0);
     }
     /**
      * <code>optional .google.protobuf.Timestamp password_expiration_date = 17;</code>
@@ -5891,7 +6048,7 @@ private static final long serialVersionUID = 0L;
       } else {
         passwordExpirationDateBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00010000;
+      bitField0_ |= 0x00020000;
       onChanged();
       return this;
     }
@@ -5905,7 +6062,7 @@ private static final long serialVersionUID = 0L;
       } else {
         passwordExpirationDateBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00010000;
+      bitField0_ |= 0x00020000;
       onChanged();
       return this;
     }
@@ -5914,7 +6071,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder mergePasswordExpirationDate(com.google.protobuf.Timestamp value) {
       if (passwordExpirationDateBuilder_ == null) {
-        if (((bitField0_ & 0x00010000) != 0) &&
+        if (((bitField0_ & 0x00020000) != 0) &&
           passwordExpirationDate_ != null &&
           passwordExpirationDate_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
           getPasswordExpirationDateBuilder().mergeFrom(value);
@@ -5925,7 +6082,7 @@ private static final long serialVersionUID = 0L;
         passwordExpirationDateBuilder_.mergeFrom(value);
       }
       if (passwordExpirationDate_ != null) {
-        bitField0_ |= 0x00010000;
+        bitField0_ |= 0x00020000;
         onChanged();
       }
       return this;
@@ -5934,7 +6091,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp password_expiration_date = 17;</code>
      */
     public Builder clearPasswordExpirationDate() {
-      bitField0_ = (bitField0_ & ~0x00010000);
+      bitField0_ = (bitField0_ & ~0x00020000);
       passwordExpirationDate_ = null;
       if (passwordExpirationDateBuilder_ != null) {
         passwordExpirationDateBuilder_.dispose();
@@ -5947,7 +6104,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp password_expiration_date = 17;</code>
      */
     public com.google.protobuf.Timestamp.Builder getPasswordExpirationDateBuilder() {
-      bitField0_ |= 0x00010000;
+      bitField0_ |= 0x00020000;
       onChanged();
       return getPasswordExpirationDateFieldBuilder().getBuilder();
     }
@@ -5986,7 +6143,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasPasswordNeverExpires() {
-      return ((bitField0_ & 0x00020000) != 0);
+      return ((bitField0_ & 0x00040000) != 0);
     }
     /**
      * <code>optional bool password_never_expires = 18;</code>
@@ -6004,7 +6161,7 @@ private static final long serialVersionUID = 0L;
     public Builder setPasswordNeverExpires(boolean value) {
 
       passwordNeverExpires_ = value;
-      bitField0_ |= 0x00020000;
+      bitField0_ |= 0x00040000;
       onChanged();
       return this;
     }
@@ -6013,7 +6170,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearPasswordNeverExpires() {
-      bitField0_ = (bitField0_ & ~0x00020000);
+      bitField0_ = (bitField0_ & ~0x00040000);
       passwordNeverExpires_ = false;
       onChanged();
       return this;
@@ -6026,7 +6183,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasPasswordRequired() {
-      return ((bitField0_ & 0x00040000) != 0);
+      return ((bitField0_ & 0x00080000) != 0);
     }
     /**
      * <code>optional bool password_required = 19;</code>
@@ -6044,7 +6201,7 @@ private static final long serialVersionUID = 0L;
     public Builder setPasswordRequired(boolean value) {
 
       passwordRequired_ = value;
-      bitField0_ |= 0x00040000;
+      bitField0_ |= 0x00080000;
       onChanged();
       return this;
     }
@@ -6053,7 +6210,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearPasswordRequired() {
-      bitField0_ = (bitField0_ & ~0x00040000);
+      bitField0_ = (bitField0_ & ~0x00080000);
       passwordRequired_ = false;
       onChanged();
       return this;
@@ -6067,7 +6224,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the passwordChangeableDate field is set.
      */
     public boolean hasPasswordChangeableDate() {
-      return ((bitField0_ & 0x00080000) != 0);
+      return ((bitField0_ & 0x00100000) != 0);
     }
     /**
      * <code>optional .google.protobuf.Timestamp password_changeable_date = 20;</code>
@@ -6092,7 +6249,7 @@ private static final long serialVersionUID = 0L;
       } else {
         passwordChangeableDateBuilder_.setMessage(value);
       }
-      bitField0_ |= 0x00080000;
+      bitField0_ |= 0x00100000;
       onChanged();
       return this;
     }
@@ -6106,7 +6263,7 @@ private static final long serialVersionUID = 0L;
       } else {
         passwordChangeableDateBuilder_.setMessage(builderForValue.build());
       }
-      bitField0_ |= 0x00080000;
+      bitField0_ |= 0x00100000;
       onChanged();
       return this;
     }
@@ -6115,7 +6272,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder mergePasswordChangeableDate(com.google.protobuf.Timestamp value) {
       if (passwordChangeableDateBuilder_ == null) {
-        if (((bitField0_ & 0x00080000) != 0) &&
+        if (((bitField0_ & 0x00100000) != 0) &&
           passwordChangeableDate_ != null &&
           passwordChangeableDate_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
           getPasswordChangeableDateBuilder().mergeFrom(value);
@@ -6126,7 +6283,7 @@ private static final long serialVersionUID = 0L;
         passwordChangeableDateBuilder_.mergeFrom(value);
       }
       if (passwordChangeableDate_ != null) {
-        bitField0_ |= 0x00080000;
+        bitField0_ |= 0x00100000;
         onChanged();
       }
       return this;
@@ -6135,7 +6292,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp password_changeable_date = 20;</code>
      */
     public Builder clearPasswordChangeableDate() {
-      bitField0_ = (bitField0_ & ~0x00080000);
+      bitField0_ = (bitField0_ & ~0x00100000);
       passwordChangeableDate_ = null;
       if (passwordChangeableDateBuilder_ != null) {
         passwordChangeableDateBuilder_.dispose();
@@ -6148,7 +6305,7 @@ private static final long serialVersionUID = 0L;
      * <code>optional .google.protobuf.Timestamp password_changeable_date = 20;</code>
      */
     public com.google.protobuf.Timestamp.Builder getPasswordChangeableDateBuilder() {
-      bitField0_ |= 0x00080000;
+      bitField0_ |= 0x00100000;
       onChanged();
       return getPasswordChangeableDateFieldBuilder().getBuilder();
     }
@@ -6186,7 +6343,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the email field is set.
      */
     public boolean hasEmail() {
-      return ((bitField0_ & 0x00100000) != 0);
+      return ((bitField0_ & 0x00200000) != 0);
     }
     /**
      * <code>optional string email = 21;</code>
@@ -6230,7 +6387,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       email_ = value;
-      bitField0_ |= 0x00100000;
+      bitField0_ |= 0x00200000;
       onChanged();
       return this;
     }
@@ -6240,7 +6397,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearEmail() {
       email_ = getDefaultInstance().getEmail();
-      bitField0_ = (bitField0_ & ~0x00100000);
+      bitField0_ = (bitField0_ & ~0x00200000);
       onChanged();
       return this;
     }
@@ -6254,7 +6411,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       email_ = value;
-      bitField0_ |= 0x00100000;
+      bitField0_ |= 0x00200000;
       onChanged();
       return this;
     }
@@ -6265,7 +6422,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the displayName field is set.
      */
     public boolean hasDisplayName() {
-      return ((bitField0_ & 0x00200000) != 0);
+      return ((bitField0_ & 0x00400000) != 0);
     }
     /**
      * <code>optional string display_name = 22;</code>
@@ -6309,7 +6466,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       displayName_ = value;
-      bitField0_ |= 0x00200000;
+      bitField0_ |= 0x00400000;
       onChanged();
       return this;
     }
@@ -6319,7 +6476,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearDisplayName() {
       displayName_ = getDefaultInstance().getDisplayName();
-      bitField0_ = (bitField0_ & ~0x00200000);
+      bitField0_ = (bitField0_ & ~0x00400000);
       onChanged();
       return this;
     }
@@ -6333,7 +6490,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       displayName_ = value;
-      bitField0_ |= 0x00200000;
+      bitField0_ |= 0x00400000;
       onChanged();
       return this;
     }
@@ -6344,7 +6501,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the givenName field is set.
      */
     public boolean hasGivenName() {
-      return ((bitField0_ & 0x00400000) != 0);
+      return ((bitField0_ & 0x00800000) != 0);
     }
     /**
      * <code>optional string given_name = 23;</code>
@@ -6388,7 +6545,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       givenName_ = value;
-      bitField0_ |= 0x00400000;
+      bitField0_ |= 0x00800000;
       onChanged();
       return this;
     }
@@ -6398,7 +6555,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearGivenName() {
       givenName_ = getDefaultInstance().getGivenName();
-      bitField0_ = (bitField0_ & ~0x00400000);
+      bitField0_ = (bitField0_ & ~0x00800000);
       onChanged();
       return this;
     }
@@ -6412,7 +6569,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       givenName_ = value;
-      bitField0_ |= 0x00400000;
+      bitField0_ |= 0x00800000;
       onChanged();
       return this;
     }
@@ -6423,7 +6580,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the surname field is set.
      */
     public boolean hasSurname() {
-      return ((bitField0_ & 0x00800000) != 0);
+      return ((bitField0_ & 0x01000000) != 0);
     }
     /**
      * <code>optional string surname = 24;</code>
@@ -6467,7 +6624,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       surname_ = value;
-      bitField0_ |= 0x00800000;
+      bitField0_ |= 0x01000000;
       onChanged();
       return this;
     }
@@ -6477,7 +6634,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearSurname() {
       surname_ = getDefaultInstance().getSurname();
-      bitField0_ = (bitField0_ & ~0x00800000);
+      bitField0_ = (bitField0_ & ~0x01000000);
       onChanged();
       return this;
     }
@@ -6491,7 +6648,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       surname_ = value;
-      bitField0_ |= 0x00800000;
+      bitField0_ |= 0x01000000;
       onChanged();
       return this;
     }
@@ -6502,7 +6659,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the telephone field is set.
      */
     public boolean hasTelephone() {
-      return ((bitField0_ & 0x01000000) != 0);
+      return ((bitField0_ & 0x02000000) != 0);
     }
     /**
      * <code>optional string telephone = 25;</code>
@@ -6546,7 +6703,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       telephone_ = value;
-      bitField0_ |= 0x01000000;
+      bitField0_ |= 0x02000000;
       onChanged();
       return this;
     }
@@ -6556,7 +6713,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearTelephone() {
       telephone_ = getDefaultInstance().getTelephone();
-      bitField0_ = (bitField0_ & ~0x01000000);
+      bitField0_ = (bitField0_ & ~0x02000000);
       onChanged();
       return this;
     }
@@ -6570,7 +6727,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       telephone_ = value;
-      bitField0_ |= 0x01000000;
+      bitField0_ |= 0x02000000;
       onChanged();
       return this;
     }
@@ -6581,7 +6738,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the facSimile field is set.
      */
     public boolean hasFacSimile() {
-      return ((bitField0_ & 0x02000000) != 0);
+      return ((bitField0_ & 0x04000000) != 0);
     }
     /**
      * <code>optional string fac_simile = 26;</code>
@@ -6625,7 +6782,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       facSimile_ = value;
-      bitField0_ |= 0x02000000;
+      bitField0_ |= 0x04000000;
       onChanged();
       return this;
     }
@@ -6635,7 +6792,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearFacSimile() {
       facSimile_ = getDefaultInstance().getFacSimile();
-      bitField0_ = (bitField0_ & ~0x02000000);
+      bitField0_ = (bitField0_ & ~0x04000000);
       onChanged();
       return this;
     }
@@ -6649,7 +6806,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       facSimile_ = value;
-      bitField0_ |= 0x02000000;
+      bitField0_ |= 0x04000000;
       onChanged();
       return this;
     }
@@ -6660,7 +6817,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the mobile field is set.
      */
     public boolean hasMobile() {
-      return ((bitField0_ & 0x04000000) != 0);
+      return ((bitField0_ & 0x08000000) != 0);
     }
     /**
      * <code>optional string mobile = 27;</code>
@@ -6704,7 +6861,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       mobile_ = value;
-      bitField0_ |= 0x04000000;
+      bitField0_ |= 0x08000000;
       onChanged();
       return this;
     }
@@ -6714,7 +6871,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearMobile() {
       mobile_ = getDefaultInstance().getMobile();
-      bitField0_ = (bitField0_ & ~0x04000000);
+      bitField0_ = (bitField0_ & ~0x08000000);
       onChanged();
       return this;
     }
@@ -6728,7 +6885,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       mobile_ = value;
-      bitField0_ |= 0x04000000;
+      bitField0_ |= 0x08000000;
       onChanged();
       return this;
     }
@@ -6739,7 +6896,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the streetAddress field is set.
      */
     public boolean hasStreetAddress() {
-      return ((bitField0_ & 0x08000000) != 0);
+      return ((bitField0_ & 0x10000000) != 0);
     }
     /**
      * <code>optional string street_address = 28;</code>
@@ -6783,7 +6940,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       streetAddress_ = value;
-      bitField0_ |= 0x08000000;
+      bitField0_ |= 0x10000000;
       onChanged();
       return this;
     }
@@ -6793,7 +6950,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearStreetAddress() {
       streetAddress_ = getDefaultInstance().getStreetAddress();
-      bitField0_ = (bitField0_ & ~0x08000000);
+      bitField0_ = (bitField0_ & ~0x10000000);
       onChanged();
       return this;
     }
@@ -6807,7 +6964,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       streetAddress_ = value;
-      bitField0_ |= 0x08000000;
+      bitField0_ |= 0x10000000;
       onChanged();
       return this;
     }
@@ -6818,7 +6975,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the city field is set.
      */
     public boolean hasCity() {
-      return ((bitField0_ & 0x10000000) != 0);
+      return ((bitField0_ & 0x20000000) != 0);
     }
     /**
      * <code>optional string city = 29;</code>
@@ -6862,7 +7019,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       city_ = value;
-      bitField0_ |= 0x10000000;
+      bitField0_ |= 0x20000000;
       onChanged();
       return this;
     }
@@ -6872,7 +7029,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearCity() {
       city_ = getDefaultInstance().getCity();
-      bitField0_ = (bitField0_ & ~0x10000000);
+      bitField0_ = (bitField0_ & ~0x20000000);
       onChanged();
       return this;
     }
@@ -6886,7 +7043,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       city_ = value;
-      bitField0_ |= 0x10000000;
+      bitField0_ |= 0x20000000;
       onChanged();
       return this;
     }
@@ -6897,7 +7054,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the country field is set.
      */
     public boolean hasCountry() {
-      return ((bitField0_ & 0x20000000) != 0);
+      return ((bitField0_ & 0x40000000) != 0);
     }
     /**
      * <code>optional string country = 30;</code>
@@ -6941,7 +7098,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       country_ = value;
-      bitField0_ |= 0x20000000;
+      bitField0_ |= 0x40000000;
       onChanged();
       return this;
     }
@@ -6951,7 +7108,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearCountry() {
       country_ = getDefaultInstance().getCountry();
-      bitField0_ = (bitField0_ & ~0x20000000);
+      bitField0_ = (bitField0_ & ~0x40000000);
       onChanged();
       return this;
     }
@@ -6965,7 +7122,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       country_ = value;
-      bitField0_ |= 0x20000000;
+      bitField0_ |= 0x40000000;
       onChanged();
       return this;
     }
@@ -6976,7 +7133,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the department field is set.
      */
     public boolean hasDepartment() {
-      return ((bitField0_ & 0x40000000) != 0);
+      return ((bitField0_ & 0x80000000) != 0);
     }
     /**
      * <code>optional string department = 31;</code>
@@ -7020,7 +7177,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       department_ = value;
-      bitField0_ |= 0x40000000;
+      bitField0_ |= 0x80000000;
       onChanged();
       return this;
     }
@@ -7030,7 +7187,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearDepartment() {
       department_ = getDefaultInstance().getDepartment();
-      bitField0_ = (bitField0_ & ~0x40000000);
+      bitField0_ = (bitField0_ & ~0x80000000);
       onChanged();
       return this;
     }
@@ -7044,7 +7201,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       department_ = value;
-      bitField0_ |= 0x40000000;
+      bitField0_ |= 0x80000000;
       onChanged();
       return this;
     }
@@ -7055,7 +7212,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the deliveryOfficeName field is set.
      */
     public boolean hasDeliveryOfficeName() {
-      return ((bitField0_ & 0x80000000) != 0);
+      return ((bitField1_ & 0x00000001) != 0);
     }
     /**
      * <code>optional string delivery_office_name = 32;</code>
@@ -7099,7 +7256,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       deliveryOfficeName_ = value;
-      bitField0_ |= 0x80000000;
+      bitField1_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -7109,7 +7266,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearDeliveryOfficeName() {
       deliveryOfficeName_ = getDefaultInstance().getDeliveryOfficeName();
-      bitField0_ = (bitField0_ & ~0x80000000);
+      bitField1_ = (bitField1_ & ~0x00000001);
       onChanged();
       return this;
     }
@@ -7123,7 +7280,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       deliveryOfficeName_ = value;
-      bitField0_ |= 0x80000000;
+      bitField1_ |= 0x00000001;
       onChanged();
       return this;
     }
@@ -7134,7 +7291,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the countryAbbreviation field is set.
      */
     public boolean hasCountryAbbreviation() {
-      return ((bitField1_ & 0x00000001) != 0);
+      return ((bitField1_ & 0x00000002) != 0);
     }
     /**
      * <code>optional string country_abbreviation = 33;</code>
@@ -7178,7 +7335,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       countryAbbreviation_ = value;
-      bitField1_ |= 0x00000001;
+      bitField1_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -7188,7 +7345,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearCountryAbbreviation() {
       countryAbbreviation_ = getDefaultInstance().getCountryAbbreviation();
-      bitField1_ = (bitField1_ & ~0x00000001);
+      bitField1_ = (bitField1_ & ~0x00000002);
       onChanged();
       return this;
     }
@@ -7202,7 +7359,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       countryAbbreviation_ = value;
-      bitField1_ |= 0x00000001;
+      bitField1_ |= 0x00000002;
       onChanged();
       return this;
     }
@@ -7213,7 +7370,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the postalCode field is set.
      */
     public boolean hasPostalCode() {
-      return ((bitField1_ & 0x00000002) != 0);
+      return ((bitField1_ & 0x00000004) != 0);
     }
     /**
      * <code>optional string postal_code = 34;</code>
@@ -7257,7 +7414,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       postalCode_ = value;
-      bitField1_ |= 0x00000002;
+      bitField1_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -7267,7 +7424,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearPostalCode() {
       postalCode_ = getDefaultInstance().getPostalCode();
-      bitField1_ = (bitField1_ & ~0x00000002);
+      bitField1_ = (bitField1_ & ~0x00000004);
       onChanged();
       return this;
     }
@@ -7281,7 +7438,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       postalCode_ = value;
-      bitField1_ |= 0x00000002;
+      bitField1_ |= 0x00000004;
       onChanged();
       return this;
     }
@@ -7292,7 +7449,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the countryCode field is set.
      */
     public boolean hasCountryCode() {
-      return ((bitField1_ & 0x00000004) != 0);
+      return ((bitField1_ & 0x00000008) != 0);
     }
     /**
      * <code>optional string country_code = 35;</code>
@@ -7336,7 +7493,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       countryCode_ = value;
-      bitField1_ |= 0x00000004;
+      bitField1_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -7346,7 +7503,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearCountryCode() {
       countryCode_ = getDefaultInstance().getCountryCode();
-      bitField1_ = (bitField1_ & ~0x00000004);
+      bitField1_ = (bitField1_ & ~0x00000008);
       onChanged();
       return this;
     }
@@ -7360,7 +7517,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       countryCode_ = value;
-      bitField1_ |= 0x00000004;
+      bitField1_ |= 0x00000008;
       onChanged();
       return this;
     }
@@ -7371,7 +7528,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the principalName field is set.
      */
     public boolean hasPrincipalName() {
-      return ((bitField1_ & 0x00000008) != 0);
+      return ((bitField1_ & 0x00000010) != 0);
     }
     /**
      * <code>optional string principal_name = 36;</code>
@@ -7415,7 +7572,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       principalName_ = value;
-      bitField1_ |= 0x00000008;
+      bitField1_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -7425,7 +7582,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearPrincipalName() {
       principalName_ = getDefaultInstance().getPrincipalName();
-      bitField1_ = (bitField1_ & ~0x00000008);
+      bitField1_ = (bitField1_ & ~0x00000010);
       onChanged();
       return this;
     }
@@ -7439,7 +7596,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       principalName_ = value;
-      bitField1_ |= 0x00000008;
+      bitField1_ |= 0x00000010;
       onChanged();
       return this;
     }
@@ -7450,7 +7607,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the title field is set.
      */
     public boolean hasTitle() {
-      return ((bitField1_ & 0x00000010) != 0);
+      return ((bitField1_ & 0x00000020) != 0);
     }
     /**
      * <code>optional string title = 37;</code>
@@ -7494,7 +7651,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       title_ = value;
-      bitField1_ |= 0x00000010;
+      bitField1_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -7504,7 +7661,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearTitle() {
       title_ = getDefaultInstance().getTitle();
-      bitField1_ = (bitField1_ & ~0x00000010);
+      bitField1_ = (bitField1_ & ~0x00000020);
       onChanged();
       return this;
     }
@@ -7518,7 +7675,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       title_ = value;
-      bitField1_ |= 0x00000010;
+      bitField1_ |= 0x00000020;
       onChanged();
       return this;
     }
@@ -7529,7 +7686,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the division field is set.
      */
     public boolean hasDivision() {
-      return ((bitField1_ & 0x00000020) != 0);
+      return ((bitField1_ & 0x00000040) != 0);
     }
     /**
      * <code>optional string division = 38;</code>
@@ -7573,7 +7730,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       division_ = value;
-      bitField1_ |= 0x00000020;
+      bitField1_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -7583,7 +7740,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearDivision() {
       division_ = getDefaultInstance().getDivision();
-      bitField1_ = (bitField1_ & ~0x00000020);
+      bitField1_ = (bitField1_ & ~0x00000040);
       onChanged();
       return this;
     }
@@ -7597,7 +7754,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       division_ = value;
-      bitField1_ |= 0x00000020;
+      bitField1_ |= 0x00000040;
       onChanged();
       return this;
     }
@@ -7608,7 +7765,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the info field is set.
      */
     public boolean hasInfo() {
-      return ((bitField1_ & 0x00000040) != 0);
+      return ((bitField1_ & 0x00000080) != 0);
     }
     /**
      * <code>optional string info = 39;</code>
@@ -7652,7 +7809,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       info_ = value;
-      bitField1_ |= 0x00000040;
+      bitField1_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -7662,7 +7819,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearInfo() {
       info_ = getDefaultInstance().getInfo();
-      bitField1_ = (bitField1_ & ~0x00000040);
+      bitField1_ = (bitField1_ & ~0x00000080);
       onChanged();
       return this;
     }
@@ -7676,7 +7833,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       info_ = value;
-      bitField1_ |= 0x00000040;
+      bitField1_ |= 0x00000080;
       onChanged();
       return this;
     }
@@ -7687,7 +7844,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the homePhone field is set.
      */
     public boolean hasHomePhone() {
-      return ((bitField1_ & 0x00000080) != 0);
+      return ((bitField1_ & 0x00000100) != 0);
     }
     /**
      * <code>optional string home_phone = 40;</code>
@@ -7731,7 +7888,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       homePhone_ = value;
-      bitField1_ |= 0x00000080;
+      bitField1_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -7741,7 +7898,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearHomePhone() {
       homePhone_ = getDefaultInstance().getHomePhone();
-      bitField1_ = (bitField1_ & ~0x00000080);
+      bitField1_ = (bitField1_ & ~0x00000100);
       onChanged();
       return this;
     }
@@ -7755,7 +7912,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       homePhone_ = value;
-      bitField1_ |= 0x00000080;
+      bitField1_ |= 0x00000100;
       onChanged();
       return this;
     }
@@ -7766,7 +7923,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the pager field is set.
      */
     public boolean hasPager() {
-      return ((bitField1_ & 0x00000100) != 0);
+      return ((bitField1_ & 0x00000200) != 0);
     }
     /**
      * <code>optional string pager = 41;</code>
@@ -7810,7 +7967,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       pager_ = value;
-      bitField1_ |= 0x00000100;
+      bitField1_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -7820,7 +7977,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearPager() {
       pager_ = getDefaultInstance().getPager();
-      bitField1_ = (bitField1_ & ~0x00000100);
+      bitField1_ = (bitField1_ & ~0x00000200);
       onChanged();
       return this;
     }
@@ -7834,7 +7991,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       pager_ = value;
-      bitField1_ |= 0x00000100;
+      bitField1_ |= 0x00000200;
       onChanged();
       return this;
     }
@@ -7845,7 +8002,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the ipPhone field is set.
      */
     public boolean hasIpPhone() {
-      return ((bitField1_ & 0x00000200) != 0);
+      return ((bitField1_ & 0x00000400) != 0);
     }
     /**
      * <code>optional string ip_phone = 42;</code>
@@ -7889,7 +8046,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       ipPhone_ = value;
-      bitField1_ |= 0x00000200;
+      bitField1_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -7899,7 +8056,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearIpPhone() {
       ipPhone_ = getDefaultInstance().getIpPhone();
-      bitField1_ = (bitField1_ & ~0x00000200);
+      bitField1_ = (bitField1_ & ~0x00000400);
       onChanged();
       return this;
     }
@@ -7913,7 +8070,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       ipPhone_ = value;
-      bitField1_ |= 0x00000200;
+      bitField1_ |= 0x00000400;
       onChanged();
       return this;
     }
@@ -7924,7 +8081,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the homePage field is set.
      */
     public boolean hasHomePage() {
-      return ((bitField1_ & 0x00000400) != 0);
+      return ((bitField1_ & 0x00000800) != 0);
     }
     /**
      * <code>optional string home_page = 43;</code>
@@ -7968,7 +8125,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       homePage_ = value;
-      bitField1_ |= 0x00000400;
+      bitField1_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -7978,7 +8135,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearHomePage() {
       homePage_ = getDefaultInstance().getHomePage();
-      bitField1_ = (bitField1_ & ~0x00000400);
+      bitField1_ = (bitField1_ & ~0x00000800);
       onChanged();
       return this;
     }
@@ -7992,7 +8149,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       homePage_ = value;
-      bitField1_ |= 0x00000400;
+      bitField1_ |= 0x00000800;
       onChanged();
       return this;
     }
@@ -8003,7 +8160,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the postOfficeBox field is set.
      */
     public boolean hasPostOfficeBox() {
-      return ((bitField1_ & 0x00000800) != 0);
+      return ((bitField1_ & 0x00001000) != 0);
     }
     /**
      * <code>optional string post_office_box = 44;</code>
@@ -8047,7 +8204,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       postOfficeBox_ = value;
-      bitField1_ |= 0x00000800;
+      bitField1_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -8057,7 +8214,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearPostOfficeBox() {
       postOfficeBox_ = getDefaultInstance().getPostOfficeBox();
-      bitField1_ = (bitField1_ & ~0x00000800);
+      bitField1_ = (bitField1_ & ~0x00001000);
       onChanged();
       return this;
     }
@@ -8071,7 +8228,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       postOfficeBox_ = value;
-      bitField1_ |= 0x00000800;
+      bitField1_ |= 0x00001000;
       onChanged();
       return this;
     }
@@ -8082,7 +8239,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the state field is set.
      */
     public boolean hasState() {
-      return ((bitField1_ & 0x00001000) != 0);
+      return ((bitField1_ & 0x00002000) != 0);
     }
     /**
      * <code>optional string state = 45;</code>
@@ -8126,7 +8283,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       state_ = value;
-      bitField1_ |= 0x00001000;
+      bitField1_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -8136,7 +8293,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearState() {
       state_ = getDefaultInstance().getState();
-      bitField1_ = (bitField1_ & ~0x00001000);
+      bitField1_ = (bitField1_ & ~0x00002000);
       onChanged();
       return this;
     }
@@ -8150,7 +8307,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       state_ = value;
-      bitField1_ |= 0x00001000;
+      bitField1_ |= 0x00002000;
       onChanged();
       return this;
     }
@@ -8161,7 +8318,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the profilePath field is set.
      */
     public boolean hasProfilePath() {
-      return ((bitField1_ & 0x00002000) != 0);
+      return ((bitField1_ & 0x00004000) != 0);
     }
     /**
      * <code>optional string profile_path = 46;</code>
@@ -8205,7 +8362,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       profilePath_ = value;
-      bitField1_ |= 0x00002000;
+      bitField1_ |= 0x00004000;
       onChanged();
       return this;
     }
@@ -8215,7 +8372,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearProfilePath() {
       profilePath_ = getDefaultInstance().getProfilePath();
-      bitField1_ = (bitField1_ & ~0x00002000);
+      bitField1_ = (bitField1_ & ~0x00004000);
       onChanged();
       return this;
     }
@@ -8229,7 +8386,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       profilePath_ = value;
-      bitField1_ |= 0x00002000;
+      bitField1_ |= 0x00004000;
       onChanged();
       return this;
     }
@@ -8240,7 +8397,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the scriptPath field is set.
      */
     public boolean hasScriptPath() {
-      return ((bitField1_ & 0x00004000) != 0);
+      return ((bitField1_ & 0x00008000) != 0);
     }
     /**
      * <code>optional string script_path = 47;</code>
@@ -8284,7 +8441,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       scriptPath_ = value;
-      bitField1_ |= 0x00004000;
+      bitField1_ |= 0x00008000;
       onChanged();
       return this;
     }
@@ -8294,7 +8451,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearScriptPath() {
       scriptPath_ = getDefaultInstance().getScriptPath();
-      bitField1_ = (bitField1_ & ~0x00004000);
+      bitField1_ = (bitField1_ & ~0x00008000);
       onChanged();
       return this;
     }
@@ -8308,7 +8465,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       scriptPath_ = value;
-      bitField1_ |= 0x00004000;
+      bitField1_ |= 0x00008000;
       onChanged();
       return this;
     }
@@ -8319,7 +8476,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the homeDirectory field is set.
      */
     public boolean hasHomeDirectory() {
-      return ((bitField1_ & 0x00008000) != 0);
+      return ((bitField1_ & 0x00010000) != 0);
     }
     /**
      * <code>optional string home_directory = 48;</code>
@@ -8363,7 +8520,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       homeDirectory_ = value;
-      bitField1_ |= 0x00008000;
+      bitField1_ |= 0x00010000;
       onChanged();
       return this;
     }
@@ -8373,7 +8530,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearHomeDirectory() {
       homeDirectory_ = getDefaultInstance().getHomeDirectory();
-      bitField1_ = (bitField1_ & ~0x00008000);
+      bitField1_ = (bitField1_ & ~0x00010000);
       onChanged();
       return this;
     }
@@ -8387,7 +8544,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       homeDirectory_ = value;
-      bitField1_ |= 0x00008000;
+      bitField1_ |= 0x00010000;
       onChanged();
       return this;
     }
@@ -8399,7 +8556,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasThumbnailPhoto() {
-      return ((bitField1_ & 0x00010000) != 0);
+      return ((bitField1_ & 0x00020000) != 0);
     }
     /**
      * <code>optional bytes thumbnail_photo = 49;</code>
@@ -8417,7 +8574,7 @@ private static final long serialVersionUID = 0L;
     public Builder setThumbnailPhoto(com.google.protobuf.ByteString value) {
       if (value == null) { throw new NullPointerException(); }
       thumbnailPhoto_ = value;
-      bitField1_ |= 0x00010000;
+      bitField1_ |= 0x00020000;
       onChanged();
       return this;
     }
@@ -8426,7 +8583,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearThumbnailPhoto() {
-      bitField1_ = (bitField1_ & ~0x00010000);
+      bitField1_ = (bitField1_ & ~0x00020000);
       thumbnailPhoto_ = getDefaultInstance().getThumbnailPhoto();
       onChanged();
       return this;
@@ -8438,7 +8595,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the employeeId field is set.
      */
     public boolean hasEmployeeId() {
-      return ((bitField1_ & 0x00020000) != 0);
+      return ((bitField1_ & 0x00040000) != 0);
     }
     /**
      * <code>optional string employee_id = 50;</code>
@@ -8482,7 +8639,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       employeeId_ = value;
-      bitField1_ |= 0x00020000;
+      bitField1_ |= 0x00040000;
       onChanged();
       return this;
     }
@@ -8492,7 +8649,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearEmployeeId() {
       employeeId_ = getDefaultInstance().getEmployeeId();
-      bitField1_ = (bitField1_ & ~0x00020000);
+      bitField1_ = (bitField1_ & ~0x00040000);
       onChanged();
       return this;
     }
@@ -8506,7 +8663,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       employeeId_ = value;
-      bitField1_ |= 0x00020000;
+      bitField1_ |= 0x00040000;
       onChanged();
       return this;
     }
@@ -8517,7 +8674,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the employeeNumber field is set.
      */
     public boolean hasEmployeeNumber() {
-      return ((bitField1_ & 0x00040000) != 0);
+      return ((bitField1_ & 0x00080000) != 0);
     }
     /**
      * <code>optional string employee_number = 51;</code>
@@ -8561,7 +8718,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       employeeNumber_ = value;
-      bitField1_ |= 0x00040000;
+      bitField1_ |= 0x00080000;
       onChanged();
       return this;
     }
@@ -8571,7 +8728,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearEmployeeNumber() {
       employeeNumber_ = getDefaultInstance().getEmployeeNumber();
-      bitField1_ = (bitField1_ & ~0x00040000);
+      bitField1_ = (bitField1_ & ~0x00080000);
       onChanged();
       return this;
     }
@@ -8585,7 +8742,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       employeeNumber_ = value;
-      bitField1_ |= 0x00040000;
+      bitField1_ |= 0x00080000;
       onChanged();
       return this;
     }
@@ -8596,7 +8753,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the employeeType field is set.
      */
     public boolean hasEmployeeType() {
-      return ((bitField1_ & 0x00080000) != 0);
+      return ((bitField1_ & 0x00100000) != 0);
     }
     /**
      * <code>optional string employee_type = 52;</code>
@@ -8640,7 +8797,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       employeeType_ = value;
-      bitField1_ |= 0x00080000;
+      bitField1_ |= 0x00100000;
       onChanged();
       return this;
     }
@@ -8650,7 +8807,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearEmployeeType() {
       employeeType_ = getDefaultInstance().getEmployeeType();
-      bitField1_ = (bitField1_ & ~0x00080000);
+      bitField1_ = (bitField1_ & ~0x00100000);
       onChanged();
       return this;
     }
@@ -8664,7 +8821,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       employeeType_ = value;
-      bitField1_ |= 0x00080000;
+      bitField1_ |= 0x00100000;
       onChanged();
       return this;
     }
@@ -8675,7 +8832,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the initials field is set.
      */
     public boolean hasInitials() {
-      return ((bitField1_ & 0x00100000) != 0);
+      return ((bitField1_ & 0x00200000) != 0);
     }
     /**
      * <code>optional string initials = 53;</code>
@@ -8719,7 +8876,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       initials_ = value;
-      bitField1_ |= 0x00100000;
+      bitField1_ |= 0x00200000;
       onChanged();
       return this;
     }
@@ -8729,7 +8886,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearInitials() {
       initials_ = getDefaultInstance().getInitials();
-      bitField1_ = (bitField1_ & ~0x00100000);
+      bitField1_ = (bitField1_ & ~0x00200000);
       onChanged();
       return this;
     }
@@ -8743,7 +8900,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       initials_ = value;
-      bitField1_ |= 0x00100000;
+      bitField1_ |= 0x00200000;
       onChanged();
       return this;
     }
@@ -8754,7 +8911,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the middleName field is set.
      */
     public boolean hasMiddleName() {
-      return ((bitField1_ & 0x00200000) != 0);
+      return ((bitField1_ & 0x00400000) != 0);
     }
     /**
      * <code>optional string middle_name = 54;</code>
@@ -8798,7 +8955,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       middleName_ = value;
-      bitField1_ |= 0x00200000;
+      bitField1_ |= 0x00400000;
       onChanged();
       return this;
     }
@@ -8808,7 +8965,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearMiddleName() {
       middleName_ = getDefaultInstance().getMiddleName();
-      bitField1_ = (bitField1_ & ~0x00200000);
+      bitField1_ = (bitField1_ & ~0x00400000);
       onChanged();
       return this;
     }
@@ -8822,7 +8979,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       middleName_ = value;
-      bitField1_ |= 0x00200000;
+      bitField1_ |= 0x00400000;
       onChanged();
       return this;
     }
@@ -8833,7 +8990,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the primaryGroupOid field is set.
      */
     public boolean hasPrimaryGroupOid() {
-      return ((bitField1_ & 0x00400000) != 0);
+      return ((bitField1_ & 0x00800000) != 0);
     }
     /**
      * <code>optional string primary_group_oid = 55;</code>
@@ -8877,7 +9034,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       primaryGroupOid_ = value;
-      bitField1_ |= 0x00400000;
+      bitField1_ |= 0x00800000;
       onChanged();
       return this;
     }
@@ -8887,7 +9044,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearPrimaryGroupOid() {
       primaryGroupOid_ = getDefaultInstance().getPrimaryGroupOid();
-      bitField1_ = (bitField1_ & ~0x00400000);
+      bitField1_ = (bitField1_ & ~0x00800000);
       onChanged();
       return this;
     }
@@ -8901,7 +9058,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       primaryGroupOid_ = value;
-      bitField1_ |= 0x00400000;
+      bitField1_ |= 0x00800000;
       onChanged();
       return this;
     }
@@ -8912,7 +9069,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the managerOid field is set.
      */
     public boolean hasManagerOid() {
-      return ((bitField1_ & 0x00800000) != 0);
+      return ((bitField1_ & 0x01000000) != 0);
     }
     /**
      * <code>optional string manager_oid = 56;</code>
@@ -8956,7 +9113,7 @@ private static final long serialVersionUID = 0L;
         java.lang.String value) {
       if (value == null) { throw new NullPointerException(); }
       managerOid_ = value;
-      bitField1_ |= 0x00800000;
+      bitField1_ |= 0x01000000;
       onChanged();
       return this;
     }
@@ -8966,7 +9123,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearManagerOid() {
       managerOid_ = getDefaultInstance().getManagerOid();
-      bitField1_ = (bitField1_ & ~0x00800000);
+      bitField1_ = (bitField1_ & ~0x01000000);
       onChanged();
       return this;
     }
@@ -8980,7 +9137,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       checkByteStringIsUtf8(value);
       managerOid_ = value;
-      bitField1_ |= 0x00800000;
+      bitField1_ |= 0x01000000;
       onChanged();
       return this;
     }
@@ -8991,7 +9148,7 @@ private static final long serialVersionUID = 0L;
       if (!memberOfOid_.isModifiable()) {
         memberOfOid_ = new com.google.protobuf.LazyStringArrayList(memberOfOid_);
       }
-      bitField1_ |= 0x01000000;
+      bitField1_ |= 0x02000000;
     }
     /**
      * <code>repeated string member_of_oid = 57;</code>
@@ -9037,7 +9194,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       ensureMemberOfOidIsMutable();
       memberOfOid_.set(index, value);
-      bitField1_ |= 0x01000000;
+      bitField1_ |= 0x02000000;
       onChanged();
       return this;
     }
@@ -9051,7 +9208,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) { throw new NullPointerException(); }
       ensureMemberOfOidIsMutable();
       memberOfOid_.add(value);
-      bitField1_ |= 0x01000000;
+      bitField1_ |= 0x02000000;
       onChanged();
       return this;
     }
@@ -9065,7 +9222,7 @@ private static final long serialVersionUID = 0L;
       ensureMemberOfOidIsMutable();
       com.google.protobuf.AbstractMessageLite.Builder.addAll(
           values, memberOfOid_);
-      bitField1_ |= 0x01000000;
+      bitField1_ |= 0x02000000;
       onChanged();
       return this;
     }
@@ -9076,7 +9233,7 @@ private static final long serialVersionUID = 0L;
     public Builder clearMemberOfOid() {
       memberOfOid_ =
         com.google.protobuf.LazyStringArrayList.emptyList();
-      bitField1_ = (bitField1_ & ~0x01000000);;
+      bitField1_ = (bitField1_ & ~0x02000000);;
       onChanged();
       return this;
     }
@@ -9091,7 +9248,7 @@ private static final long serialVersionUID = 0L;
       checkByteStringIsUtf8(value);
       ensureMemberOfOidIsMutable();
       memberOfOid_.add(value);
-      bitField1_ |= 0x01000000;
+      bitField1_ |= 0x02000000;
       onChanged();
       return this;
     }