Merge branch 'ticket/11761' into feature/session-storage