Add GroupLock
Merge branch 'mbst-6785-multi-equiv-write' into stage

* mbst-6785-multi-equiv-write:
  Add GroupLock