Adds fixes for server now returning strings instead of integers for object IDs
Merge branch 'fix/string_ids' into develop