Merge "dscpPolicy - further improvements"