Update with latest verion of WEC-Sim/WEC-Sim before merge
Update with latest verion of WEC-Sim/WEC-Sim before merge

Merge remote-tracking branch 'upstream/master'


Former-commit-id: e55734fe7f17a79e5df85d72e305619d5a934826
Former-commit-id: 8faa58f0f70f76c322ad53b5b5a60bde8fbf2df9
WEC-Sim/WEC-Sim