added LogonContext
merged