merge 3.7.1-dev
Deleted .idea/SOL011.iml, .idea/encodings.xml, .idea/modules.xml, .idea/vcs.xml, .idea/workspace.xml files
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.
Deleted .idea/SOL011.iml, .idea/encodings.xml, .idea/modules.xml, .idea/vcs.xml, .idea/workspace.xml files