Merge "elm_transit - fixed incorrect logic for recorvering objects' states-context."