Upstream version 10-265