Merge "Revert "Fix FDE""