Merge branch 'lukas_issue368_feat_prepare-cnn-class-for-filter-benchmarking'...

Merge branch 'lukas_issue368_feat_prepare-cnn-class-for-filter-benchmarking' into 'lukas_issue359_feat_separate-uncertainty-estimate-for-each-forecast-step'

Lukas issue368 feat prepare cnn class for filter benchmarking

See merge request !406