Merge "Add feature flag and EMBMS bug fixes"