Merge branch 'maint/7.0'