Merge "Add multi-user test for the general non-staged case"