Merge branch 'releasenotes97m7'