Fmd dev

Merging FMD Branch back to master