Merge "Adds missing server tags APIs to servers client."