Serializers: cherry picked from topic/serializers-integration.