Merge "Fix sample code insertion."