Manual merge of 07d07b0