Merge branch 'dl/honor-cflags-in-hdr-check'