Fix bug after merge
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0