Merge branch 'da/include-compat-util-first-in-c'