Trac/13825 1

This PR includes a kernel upgrade task.