Merge "Fix comment typo in common_data.h" into nextgenv2