FIX: redo commit for Inline kernel build support