Merge "Fill server schema for microversion 2.9"