fixed arb mod
regenerate manifest
Merge branch 'develop'
Merge branch 'master' into stable