fix unused variables
Merge commit 'dbf4f370777249078ffb80d1e2208388f5d2dea7' into jelly_3.4