Updates to upstream version 3.3