Manual merge of PR 1.