Upstream version 04-173