Merge "nfc.default: remove unneeded dependency" into oc-dev