Merge release 7.0.0