Merge "Wrap start and stop user clients in an operation." into sc-dev