First commit - Changes for feature flag notificaton