Merge "Method to override feature flag" into tm-qpr-dev