[openFATE 307154] merge kernel-$flavor-base back to kernel-$flavor