Merge "Updating userState shortcut targets to enforce defensive copying" into main