Merge "Rollback params"