Upstream version 1.12.6