Merge "Fix ssid storage regression"