odi bug fix
Merge remote-tracking branch 'origin/dip' into dip