Sorry about that, don't know how I got these bill numbers in there...
The bill for the house was the DeFazio/Mica amendment to H.R.1817 - there are four versions of that bill (?), sec.310A talks about the FFDO part.

I do not know what the corresponding Senate bill number is. Last thing I heard was that is is stuck in some subcomitee.

Does anybody know the correct bill number and status of it?