Merge "Fix re-parenting for modifications to the profile."