New font props and attributes
Merge branch 'amadeus-new-props'
New font props and attributes