Upstream version 3.16.7