Merge "[QL-v3] Add feature flag." into tm-qpr-dev