Merge "Regenerate adf header"