merge of '61fbd617cd31be5cf16e7fef30e206cf64890e27'