More generator tweaks
More tweaking
KAS container for module base
Collider fix
Merge remote-tracking branch 'upstream/master'