Merge r16619 to 8.09; bump patch level