Merge "Add buffer result for generating vendor configs" into main