Merge pull request #3431 from sehaas/fm4