Remove unused parameter warning.
Additional ignores
Merge branch 'master' into api-fix