jam and jive edits
Merge branch 'dev'