Merge "<kernel> compat check can be split"