merge branch line and avoid
Merge branch 'objectAvoid'