Merge "Improve server tag schema"