fix for 1000v
quick update
Merge branch 'master' into tcu