Merge branch 'master' into basic-simulator

2 jobs for basic-simulator in 1 minute and 46 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #448104
se
BranchJobLinux

00:01:14

passed #448103
Windows10
masterJobWindows

00:00:32