Merge "Add internal methods for setting identity clients"