Merge branch 'code_review_changes' into 'master'

Code review changes

See merge request !3
2 jobs for master in 4 minutes and 20 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Windows
passed masterJobWindows #270871
Windows10

00:02:09

 
  Linux
passed masterJobLinux #270872

00:02:11