Manual merge of PR 69