r23730: Squashed commit of the following: