r9536: