Update kernel config
Merge final changes