Upstream version 05-154