Imported Upstream version 31.0