Fixing so uploads don't happen when logger is disabled
Merging updates