Merge "Fixed warnings of unused functions" into nextgenv2