Merge "Fix the bug that PVQ commit broke dering" into nextgenv2