Imported Upstream version 24.2.0