Fix missing ,
Add FF.Filter into Merge file
Compile with latest commits