Merge "Embms API adjustments for 7/21"