Merge branch 'kinetic'