Merge "Nemo CTS: Call the right class for SSL" into cw-e-dev