Upstream release 1.2.10