Imported Upstream version 3.3-rc2
Imported Upstream version 3.3