Forward-port fixes to Show DCP from master.