Upstream version 4.16.12