Updated to last kernel and updater version.
Merge branch 'develop'