Imported Upstream version 24.5.0