Merge "Fill update, rebuild API response schema for 2.9"