Merge "Remove redundant void statement" into nextgenv2