Upstream version 4.12.12