Merge remote branch 'origin/master' into db
Merge branch 'db' of github.com:FLVC/offline-ingest into db
test mode added, error handling extended to fail faster