Upstream version 2.0.12