Merge "Resolve merge issues with --enable-pvq" into nextgenv2