Merge "Update font PS name" into main