Added User.Local (optional)
Merge branch 'feature/grantb/US-1069' into develop