Merge "dscpPolicy: minor optimization for verifier" into main