Adding stats to db working for canister-session
Merge with master
Fix merge conflict