Manual merge of faa3058