Imported Upstream version 2.7.0