Imported Upstream version 31.1.0