Upstream changes (3.3.3)