Merge "Embms adjustments for 7/28"