Merge "Fill servers schema for microversion 2.3"