A proper merge of main branch into Aktors fork