Imported Upstream version 1.65