Merge pull request #2421 from SibrenVasse/ssid_format