Imported Upstream version 0.3.3 - merge fix