[FIX] Rollback

Merged Tomás Canzoniero requested to merge fix_rollback into 11.0-stage

Merge request reports