Upstream version 3.24.27