Manual Merge of Delay PR