Minor tweak and format for v7.1
Merge branch 'refs/heads/v7.1'