Merge "Add new auth types to capture bitmask values and unspecified auth types." into main