Imported Upstream version 8.0.7