[GCC] unused parameter warning cleanup
Merge branch 'dev'
[GCC] unused parameter warning cleanup
Merge branch 'dev'