revert back to pre-ghost code
Merge branch 'dev'