Fixing bug in Simulator when there is only one m3ua connection
Merge remote-tracking branch 'origin/cap44'