Merge "Remove #updateStoredSession (6/n)"