Manual merge of a8aec64