Merge "Remove rollbacks with invalid sessions"