Merge "Improve "Enabling rollback" log with rollbackId and originalSessionId" into main