Merging new app code - work in progress.
Fixed upload speed measurement for old-style upload speed testing