Imported Upstream version 1.24.1