RF-13875: do not timeout session, fix subscription handling