GPII-742: Merge with Chris' GPII-743.