When will $FET be merged?