Imported Upstream version 3.11.0