Merge "Add dynamic font support"