Merge "fix build issue with --enable-delta-q" into nextgenv2