Imported Upstream release 3.11