Merge branch 'CONFIG_BOX_KERNEL_AUTO' into nztrain