Fix SSL fonts issue
merge