Adjustment to features missing from merge

No match.