Imported Upstream version 1.97