#179: More work on bulk user upload work