Upstream version 3.3-3