Merge "Silence some warnings" into nextgenv2