merge updates from datalogcompiler