Sync with fdm.

12 files changed