Merge "Reviewing guideline: ask for CRD when new test+feature flag"