Updated sources from upstream 1.10.12