Update on #1042. Fixed order of returned kernels
Merge pull request #1070 from van51/develop

Update on #1042. Fixed order of returned kernels