Merge "Update SO container endpoints"