Merge "Updates noparent to only apply to the per-file files."