Upstream version 4.3.3