Fixed commited conflict with nfn upstream