Redo Kernel without ID in public constructor
Merge origin/master