fix: [1/2] Base: MultiUser support

Change-Id: Ic82b7b5eaeb542d8c2482d5bcb32e06be9e4af38