Merge "ssl support janitor"