Merge branch '77-add-optional-primitives-per-squad-to-planning-configuration' into '67-mas-dt'
Resolve "Add optional primitives per squad to planning configuration" See merge request !47
Resolve "Add optional primitives per squad to planning configuration" See merge request !47