Add some codes for MFC
Revert "Add some codes for MFC"

This reverts commit 7964eaa405249259b50cac7f4dae03b3e2a5278f.
Add some codes for MFC