Merge "Modify based on the vendor feedback"