backported: included fonts for local access also
merged