resolved concflict after cherry-pick 7eba297.
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
unused global
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>