Merge branch 'adapt_cnnpredictor_template' into 'master'

Adapt cnnpredictor template

See merge request !9
2 jobs for master in 7 minutes and 53 seconds
Status Name Job ID Coverage
  Windows
passed masterJobWindows #202095
Windows10

00:03:13

 
  Linux
passed masterJobLinux #202096

00:04:39