Merge-fix: Update changed files from merge for ref-counted.