Merge "Rollbacks shouldn't be removed when it session expires (1/n)" into sc-dev