Merge from main branch into Aktors fork