Merge to support NFE.