[MRCpy/MRCpy] [MachineLearningBCAM/MRCpy] bff66e: fixing changes after merge