merged with kai/dynamic
merged kai/dynamic; runs on gaza