Updating and adding QualityStage built-in rules

From C-7KDB897