Update with v2.7.1 changes