Small fix for avoiding tanks
Merge branch 'develop' into tank_fix
Merge branch 'develop' into tank_fix