corrections
Merge remote-tracking branch 'origin/version_7' into version_7