Upstream version 2.0.16-stable