Merging Source v1.7.2: plant changes