Updating to version 2.7.1.
Merge branch 'release/v2.7.1' into develop