Merge "Fix enforce calling package behavior in multi-user context." into sc-dev