Forwardport of #200