Upstream version 1.32.1