Changes from FONTY.
Merge.