extend prod kernel for handling more than 2 kernels
Merge branch 'devel' for extending prod kernel