Imported Upstream version 3.3.0.18