synchronize to latest ffm changes