Enabled impersonation and checked permissions.
merge with master