Imported Upstream version 1.25.2