Merge pull request #8736 from joelucid/ff2_1