workspaces, the saga continues

Change-Id: Iec2efccf8aa097bfd66a26673999b19eab26897f