Merge "Fix compiler warning of un-used variables" into nextgenv2