univariate fixes

Merged Jean-Didier Totow requested to merge cnn_univariate_fix into morphemic-rc1.5

Merge request reports