Merge "Fix inline extservices implementation for multiuser."