Upstream version 5.24.2