Merge "Update smo deployment with ICS"