Imported Upstream version 31.2.0