Merge "Allow 2 requsts to be added without SSID with command line." into tm-dev