Merge updates from main repo

Merge updates which fix font related memory leak