Manual merge of aec08bce7f