Merge Devfeatures to master

Merging support for multiple soldiers to master