This should be a pullup of r20479 (ticket #5925). References updated accordingly.