Merge "Attach logging package to staged rollback IDs"