jam and jive updates
Merge branch 'dev'