pre-test code refactor
fix for service doc
more cleanup
more cleanup
Merge branch 'develop' into feature/db_schema_merge
Merge branch 'feature/db_schema_merge' into develop