Merge "Added changes for utilising a common feature flag"