Merge branch '3.7.1-dev' into 'master'
3.7.1 dev See merge request !20
WARNING! Gitlab maintenance operation scheduled for Thursday, 18 June between 19:00 and 20:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
3.7.1 dev See merge request !20