Manual merge of commit #42