AAD-36: use new session to avoid flush problem