Merge "Make inline function static to fix clang compile error" into nextgenv2