Imported Upstream version 6.8.9.0