Patches Ncc resolve and arg: #6771 Remove magic-string: #6772 Credits Huge thanks to @dav-is for helping!