Merge "Fix compile error with --enable-accounting" into nextgenv2