BACKLOG-4036 : fix context issue