Upstream version 6.10.11