Fix backward compatibility

Merged Andrea Gianarda requested to merge fix/backward_compatibility_master into master

Merge request reports