Updated to last kernel
Merge branch 'develop'