Upstream version 3.30.1