Merging latest #develop into #next

Results of "npm test" (Unit Tests only)
Bringing #next up to date after merging PR#1101

```
********************************************
Consolidated Test Report Summary
********************************************
Total Number of Executed Tests  :633
Total Number of Passed Tests  : 621
Total Number of Failed Tests  : 0
Total Number of Skipped Tests  : 12
********************************************

Total Time of Execution :74.66 seconds
```