added additional search path for COI
Merge remote branch 'origin/v2.1'