major changes for dev-cleanup
Merge branch 'n8fr8-dev-cleanup'