Merge "Prepare backporting CNF to Hunter and newer"