One more kit test
Merge branch 'master' into uuid-support