Merge branch 'v2.7.1'
Merging v2.7.1 branch into master.
WARNING! GitLab maintenance operation scheduled for today between 12:00 and 14:00 (CET). During this time window, GitLab will be unavailable, and any data entered during this period may be lost. Thank you in advance for your understanding.
Merging v2.7.1 branch into master.