Manual merge of mlucy_3393.