Merge "remove redundant header" into nextgenv2