Merge "EMBMS API tweaks"