am c63b8b82: (-s ours) am 633325c4: (-s ours) DO NOT MERGE: Setting workspace id as primary key

* commit 'c63b8b82d3cd7dbb375f92cf8e3bf62d73bc0f81':
  DO NOT MERGE: Setting workspace id as primary key