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

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