2.5 - changed moxi file name
2.5 multi-instance pic
Merge branch 'cb2.5' into stage