big updates for kits
Merge remote-tracking branch 'origin/master'