Merge branch 'master' into oneclick_nn_training

Status Job ID Name Coverage
  Windows
passed #270053
Windows10
masterJobWindows

00:02:15

 
  Linux
passed #270054
BranchJobLinux

00:00:41