[WCP-88] Fixing issue that caused error when a New Session was trying to be created via the UI
Merge remote-tracking branch 'origin/uw-master' into uw-master