Imported Upstream version 24.3.0