Merge feature7106

No match.